summaryrefslogtreecommitdiff
path: root/sw/source/ui/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/dialog')
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx38
-rw-r--r--sw/source/ui/dialog/abstract.cxx8
-rw-r--r--sw/source/ui/dialog/abstract.src2
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx70
-rw-r--r--sw/source/ui/dialog/ascfldlg.src6
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx34
-rw-r--r--sw/source/ui/dialog/docstdlg.hrc4
-rw-r--r--sw/source/ui/dialog/docstdlg.src1
-rw-r--r--sw/source/ui/dialog/macassgn.cxx16
-rw-r--r--sw/source/ui/dialog/makefile.mk99
-rw-r--r--sw/source/ui/dialog/regionsw.cxx44
-rw-r--r--sw/source/ui/dialog/regionsw.src44
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx5
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx122
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx117
-rw-r--r--sw/source/ui/dialog/swwrtshitem.cxx2
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx378
17 files changed, 476 insertions, 514 deletions
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
index 84f56f586a..1d430dd47d 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
@@ -81,7 +81,7 @@ struct SpellState
bool m_bLostFocus;
//restart and progress information
- USHORT m_SpellStartPosition;
+ sal_uInt16 m_SpellStartPosition;
bool m_bBodySpelled; //body already spelled
bool m_bOtherSpelled; //frames, footnotes, headers and footers spelled
bool m_bStartedInOther; //started the spelling insided of the _other_ area
@@ -150,7 +150,7 @@ void lcl_LeaveDrawText(SwWrtShell& rSh)
{
if(rSh.GetDrawView())
{
- rSh.GetDrawView()->SdrEndTextEdit( TRUE );
+ rSh.GetDrawView()->SdrEndTextEdit( sal_True );
Point aPt(LONG_MIN, LONG_MIN);
//go out of the frame
rSh.SelectObj(aPt, SW_LEAVE_FRAME);
@@ -161,7 +161,7 @@ void lcl_LeaveDrawText(SwWrtShell& rSh)
SwSpellDialogChildWindow::SwSpellDialogChildWindow (
Window* _pParent,
- USHORT nId,
+ sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo) :
svx::SpellDialogChildWindow (
@@ -185,7 +185,7 @@ SwSpellDialogChildWindow::~SwSpellDialogChildWindow ()
SfxChildWinInfo SwSpellDialogChildWindow::GetInfo (void) const
{
SfxChildWinInfo aInfo = svx::SpellDialogChildWindow::GetInfo();
- aInfo.bVisible = FALSE;
+ aInfo.bVisible = sal_False;
return aInfo;
}
@@ -245,7 +245,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
{
m_pSpellState->pOtherCursor = new SwPaM(*pWrtShell->GetCrsr()->GetPoint());
m_pSpellState->m_bStartedInOther = true;
- pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_CURR, FALSE );
+ pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_CURR, sal_False );
}
else
{
@@ -258,7 +258,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
*pWrtShell->GetDoc(),
*pCrsr->Start(), pCrsr->End());
}
- pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END, DOCPOS_CURR, FALSE );
+ pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END, DOCPOS_CURR, sal_False );
}
}
else
@@ -303,7 +303,7 @@ The code below would only be part of the solution.
//if there's any that has not been spelled yet
if(!m_pSpellState->m_bOtherSpelled && pWrtShell->HasOtherCnt())
{
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, FALSE );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
pWrtShell->SpellEnd();
@@ -315,7 +315,7 @@ The code below would only be part of the solution.
//if no result has been found try at the body text - completely
if(!m_pSpellState->m_bBodySpelled && !aRet.size())
{
- pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, FALSE );
+ pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, sal_False );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
m_pSpellState->m_bBodySpelled = true;
@@ -344,7 +344,7 @@ The code below would only be part of the solution.
pWrtShell->SpellEnd();
delete m_pSpellState->pOtherCursor;
m_pSpellState->pOtherCursor = 0;
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR, DOCPOS_OTHERSTART, FALSE );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR, DOCPOS_OTHERSTART, sal_False );
pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn);
}
if(!aRet.size())
@@ -357,7 +357,7 @@ The code below would only be part of the solution.
//has the body been spelled?
if(!m_pSpellState->m_bBodySpelled)
{
- pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, FALSE );
+ pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, sal_False );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
m_pSpellState->m_bBodySpelled = true;
@@ -370,7 +370,7 @@ The code below would only be part of the solution.
m_pSpellState->m_bBodySpelled = true;
if(!m_pSpellState->m_bOtherSpelled && pWrtShell->HasOtherCnt())
{
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, FALSE );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
pWrtShell->SpellEnd();
@@ -405,7 +405,7 @@ The code below would only be part of the solution.
if(m_pSpellState->m_xStartRange.is())
{
LockFocusNotification( true );
- USHORT nRet = QueryBox( GetWindow(), SW_RES(RID_QB_SPELL_CONTINUE)).Execute();
+ sal_uInt16 nRet = QueryBox( GetWindow(), SW_RES(RID_QB_SPELL_CONTINUE)).Execute();
if(RET_YES == nRet)
{
SwUnoInternalPaM aPam(*pWrtShell->GetDoc());
@@ -559,8 +559,8 @@ void SwSpellDialogChildWindow::GetFocus()
case SHELL_MODE_TABLE_LIST_TEXT:
{
SwPaM* pCursor = pWrtShell->GetCrsr();
- if(m_pSpellState->m_pPointNode != pCursor->GetNode(TRUE) ||
- m_pSpellState->m_pMarkNode != pCursor->GetNode(FALSE)||
+ if(m_pSpellState->m_pPointNode != pCursor->GetNode(sal_True) ||
+ m_pSpellState->m_pMarkNode != pCursor->GetNode(sal_False)||
m_pSpellState->m_nPointPos != pCursor->GetPoint()->nContent.GetIndex()||
m_pSpellState->m_nMarkPos != pCursor->GetMark()->nContent.GetIndex())
bInvalidate = true;
@@ -616,8 +616,8 @@ void SwSpellDialogChildWindow::LoseFocus()
{
//store a node pointer and a pam-position to be able to check on next GetFocus();
SwPaM* pCursor = pWrtShell->GetCrsr();
- m_pSpellState->m_pPointNode = pCursor->GetNode(TRUE);
- m_pSpellState->m_pMarkNode = pCursor->GetNode(FALSE);
+ m_pSpellState->m_pPointNode = pCursor->GetNode(sal_True);
+ m_pSpellState->m_pMarkNode = pCursor->GetNode(sal_False);
m_pSpellState->m_nPointPos = pCursor->GetPoint()->nContent.GetIndex();
m_pSpellState->m_nMarkPos = pCursor->GetMark()->nContent.GetIndex();
@@ -658,7 +658,7 @@ SwWrtShell* SwSpellDialogChildWindow::GetWrtShell_Impl()
SwView* pView = 0;
if(pDispatch)
{
- USHORT nShellIdx = 0;
+ sal_uInt16 nShellIdx = 0;
SfxShell* pShell;
while(0 != (pShell = pDispatch->GetShell(nShellIdx++)))
if(pShell->ISA(SwView))
@@ -846,13 +846,13 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
{
//now the current one has to be deselected
if(pCurrentTextObj)
- pDrView->SdrEndTextEdit( TRUE );
+ pDrView->SdrEndTextEdit( sal_True );
//and the found one should be activated
rSh.MakeVisible(pTextObj->GetLogicRect());
Point aTmp( 0,0 );
rSh.SelectObj( aTmp, 0, pTextObj );
SdrPageView* pPV = pDrView->GetSdrPageView();
- rView.BeginTextEdit( pTextObj, pPV, &rView.GetEditWin(), FALSE, TRUE );
+ rView.BeginTextEdit( pTextObj, pPV, &rView.GetEditWin(), sal_False, sal_True );
rView.AttrChangedNotify(&rSh);
bNextDoc = true;
}
diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx
index a43317d5c7..056c06c7a3 100644
--- a/sw/source/ui/dialog/abstract.cxx
+++ b/sw/source/ui/dialog/abstract.cxx
@@ -61,14 +61,14 @@ SwInsertAbstractDlg::~SwInsertAbstractDlg()
{
}
-BYTE SwInsertAbstractDlg::GetLevel() const
+sal_uInt8 SwInsertAbstractDlg::GetLevel() const
{
- return static_cast< BYTE >(aLevelNF.GetValue() - 1);
+ return static_cast< sal_uInt8 >(aLevelNF.GetValue() - 1);
}
-BYTE SwInsertAbstractDlg::GetPara() const
+sal_uInt8 SwInsertAbstractDlg::GetPara() const
{
- return (BYTE) aParaNF.GetValue();
+ return (sal_uInt8) aParaNF.GetValue();
}
diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src
index 6a35ffcd53..5abdc5aff0 100644
--- a/sw/source/ui/dialog/abstract.src
+++ b/sw/source/ui/dialog/abstract.src
@@ -50,6 +50,7 @@ ModalDialog DLG_INSERT_ABSTRACT
};
NumericField NF_LEVEL
{
+ HelpID = "sw:NumericField:DLG_INSERT_ABSTRACT:NF_LEVEL";
Border = TRUE ;
Pos = MAP_APPFONT ( 153 , 12 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -71,6 +72,7 @@ ModalDialog DLG_INSERT_ABSTRACT
};
NumericField NF_PARA
{
+ HelpID = "sw:NumericField:DLG_INSERT_ABSTRACT:NF_PARA";
Border = TRUE ;
Pos = MAP_APPFONT ( 153 , 27 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 3f7b493f70..11fa3926ed 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -54,13 +54,15 @@
#include <dialog.hrc>
#include <ascfldlg.hrc>
+#include "vcl/metric.hxx"
+
using namespace ::com::sun::star;
const sal_Unicode cDialogExtraDataClose = '}';
const char sDialogImpExtraData[] = "EncImpDlg:{";
const char sDialogExpExtraData[] = "EncExpDlg:{";
-const USHORT nDialogExtraDataLen = 11; // 12345678901
+const sal_uInt16 nDialogExtraDataLen = 11; // 12345678901
SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
SvStream* pStream )
@@ -80,7 +82,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
aCancelPB( this, SW_RES( PB_CANCEL )),
aHelpPB( this, SW_RES( PB_HELP )),
sSystemCharSet( SW_RES( STR_SYS_CHARSET )),
- bSaveLineStatus( TRUE )
+ bSaveLineStatus( sal_True )
{
FreeResource();
@@ -89,7 +91,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
const String& rFindNm = String::CreateFromAscii(
pStream ? sDialogImpExtraData
: sDialogExpExtraData);
- USHORT nEnd, nStt = GetExtraData().Search( rFindNm );
+ sal_uInt16 nEnd, nStt = GetExtraData().Search( rFindNm );
if( STRING_NOTFOUND != nStt )
{
nStt += nDialogExtraDataLen;
@@ -107,8 +109,8 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
if( pStream )
{
char aBuffer[ 4098 ];
- ULONG nOldPos = pStream->Tell();
- ULONG nBytesRead = pStream->Read( aBuffer, 4096 );
+ sal_uLong nOldPos = pStream->Tell();
+ sal_uLong nBytesRead = pStream->Read( aBuffer, 4096 );
pStream->Seek( nOldPos );
if( nBytesRead <= 4096 )
@@ -119,13 +121,13 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
aBuffer[ nBytesRead + 2 ] = '0';
}
- BOOL bCR = FALSE, bLF = FALSE, bNullChar = FALSE;
- for( USHORT nCnt = 0; nCnt < nBytesRead; ++nCnt )
+ sal_Bool bCR = sal_False, bLF = sal_False, bNullChar = sal_False;
+ for( sal_uInt16 nCnt = 0; nCnt < nBytesRead; ++nCnt )
switch( aBuffer[ nCnt ] )
{
- case 0x0: bNullChar = TRUE; break;
- case 0xA: bLF = TRUE; break;
- case 0xD: bCR = TRUE; break;
+ case 0x0: bNullChar = sal_True; break;
+ case 0xA: bLF = sal_True; break;
+ case 0xD: bCR = sal_True; break;
case 0xC:
case 0x1A:
case 0x9: break;
@@ -153,9 +155,9 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
SwDoc* pDoc = rDocSh.GetDoc();
- USHORT nAppScriptType = GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() );
+ sal_uInt16 nAppScriptType = GetI18NScriptTypeOfLanguage( (sal_uInt16)GetAppLanguage() );
{
- BOOL bDelPrinter = FALSE;
+ sal_Bool bDelPrinter = sal_False;
SfxPrinter* pPrt = pDoc ? pDoc->getPrinter(false) : 0;
if( !pPrt )
{
@@ -164,21 +166,31 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
0 );
pPrt = new SfxPrinter( pSet );
- bDelPrinter = TRUE;
+ bDelPrinter = sal_True;
}
-
- const USHORT nCount = pPrt->GetFontCount();
- for (USHORT i = 0; i < nCount; ++i)
+
+
+ // get the set of disctinct available family names
+ std::set< String > aFontNames;
+ int nFontNames = pPrt->GetDevFontCount();
+ for( int i = 0; i < nFontNames; i++ )
+ {
+ FontInfo aInf( pPrt->GetDevFont( i ) );
+ aFontNames.insert( aInf.GetName() );
+ }
+
+ // insert to listbox
+ for( std::set< String >::const_iterator it = aFontNames.begin();
+ it != aFontNames.end(); ++it )
{
- const String &rStr = pPrt->GetFont(i)->GetName();
- aFontLB.InsertEntry( rStr );
+ aFontLB.InsertEntry( *it );
}
if( !aOpt.GetFontName().Len() )
{
if(pDoc)
{
- USHORT nFontRes = RES_CHRATR_FONT;
+ sal_uInt16 nFontRes = RES_CHRATR_FONT;
if(SCRIPTTYPE_ASIAN == nAppScriptType)
nFontRes = RES_CHRATR_CJK_FONT;
else if(SCRIPTTYPE_COMPLEX == nAppScriptType)
@@ -189,7 +201,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
}
else
{
- USHORT nFontType = FONT_STANDARD;
+ sal_uInt16 nFontType = FONT_STANDARD;
if(SCRIPTTYPE_ASIAN == nAppScriptType)
nFontType = FONT_STANDARD_CJK;
else if(SCRIPTTYPE_COMPLEX == nAppScriptType)
@@ -209,7 +221,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
{
if(pDoc)
{
- USHORT nWhich = GetWhichOfScript( RES_CHRATR_LANGUAGE, nAppScriptType);
+ sal_uInt16 nWhich = GetWhichOfScript( RES_CHRATR_LANGUAGE, nAppScriptType);
aOpt.SetLanguage( ((SvxLanguageItem&)pDoc->
GetDefault( nWhich )).GetLanguage());
}
@@ -232,7 +244,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
}
}
- aLanguageLB.SetLanguageList( LANG_LIST_ALL, TRUE, FALSE );
+ aLanguageLB.SetLanguageList( LANG_LIST_ALL, sal_True, sal_False );
aLanguageLB.SelectLanguage( aOpt.GetLanguage() );
}
}
@@ -290,18 +302,18 @@ SwAsciiFilterDlg::~SwAsciiFilterDlg()
void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions )
{
- ULONG nCCode = aCharSetLB.GetSelectTextEncoding();
+ sal_uLong nCCode = aCharSetLB.GetSelectTextEncoding();
String sFont;
- ULONG nLng = 0;
+ sal_uLong nLng = 0;
if( aFontLB.IsVisible() )
{
sFont = aFontLB.GetSelectEntry();
- nLng = (ULONG)aLanguageLB.GetSelectLanguage();
+ nLng = (sal_uLong)aLanguageLB.GetSelectLanguage();
}
rOptions.SetFontName( sFont );
rOptions.SetCharSet( rtl_TextEncoding( nCCode ) );
- rOptions.SetLanguage( USHORT( nLng ) );
+ rOptions.SetLanguage( sal_uInt16( nLng ) );
rOptions.SetParaFlags( GetCRLF() );
// save the user settings
@@ -312,7 +324,7 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions )
const String& rFindNm = String::CreateFromAscii(
aFontLB.IsVisible() ? sDialogImpExtraData
: sDialogExpExtraData);
- USHORT nEnd, nStt = GetExtraData().Search( rFindNm );
+ sal_uInt16 nEnd, nStt = GetExtraData().Search( rFindNm );
if( STRING_NOTFOUND != nStt )
{
// called twice, so remove "old" settings
@@ -406,7 +418,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox )
}
}
- bSaveLineStatus = FALSE;
+ bSaveLineStatus = sal_False;
if( eEnd != (LineEnd)-1 ) // changed?
{
if( eOldEnd != eEnd )
@@ -419,7 +431,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox )
aCR_RB.Check( aCR_RB.GetSavedValue() );
aLF_RB.Check( aLF_RB.GetSavedValue() );
}
- bSaveLineStatus = TRUE;
+ bSaveLineStatus = sal_True;
if( nOldLng != nLng && aFontLB.IsVisible() )
aLanguageLB.SelectLanguage( nLng );
diff --git a/sw/source/ui/dialog/ascfldlg.src b/sw/source/ui/dialog/ascfldlg.src
index f10fed8a87..66be6d35c9 100644
--- a/sw/source/ui/dialog/ascfldlg.src
+++ b/sw/source/ui/dialog/ascfldlg.src
@@ -50,6 +50,7 @@ ModalDialog DLG_ASCII_FILTER
};
ListBox LB_CHARSET
{
+ HelpID = "sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET";
Pos = MAP_APPFONT ( 80 , 14 ) ;
Size = MAP_APPFONT ( 90 , 61 ) ;
TabStop = TRUE ;
@@ -64,6 +65,7 @@ ModalDialog DLG_ASCII_FILTER
};
ListBox LB_FONT
{
+ HelpID = "sw:ListBox:DLG_ASCII_FILTER:LB_FONT";
Pos = MAP_APPFONT ( 80 , 30 ) ;
Size = MAP_APPFONT ( 90 , 61 ) ;
TabStop = TRUE ;
@@ -78,6 +80,7 @@ ModalDialog DLG_ASCII_FILTER
};
ListBox LB_LANGUAGE
{
+ HelpID = "sw:ListBox:DLG_ASCII_FILTER:LB_LANGUAGE";
Pos = MAP_APPFONT ( 80 , 46 ) ;
Size = MAP_APPFONT ( 90 , 61 ) ;
TabStop = TRUE ;
@@ -92,6 +95,7 @@ ModalDialog DLG_ASCII_FILTER
};
RadioButton RB_CRLF
{
+ HelpID = "sw:RadioButton:DLG_ASCII_FILTER:RB_CRLF";
Pos = MAP_APPFONT ( 80 , 64 ) ;
Size = MAP_APPFONT ( 40 , 10 ) ;
TabStop = TRUE ;
@@ -100,6 +104,7 @@ ModalDialog DLG_ASCII_FILTER
};
RadioButton RB_CR
{
+ HelpID = "sw:RadioButton:DLG_ASCII_FILTER:RB_CR";
Pos = MAP_APPFONT ( 121 , 64 ) ;
Size = MAP_APPFONT ( 20 , 10 ) ;
// TabStop = TRUE ;
@@ -107,6 +112,7 @@ ModalDialog DLG_ASCII_FILTER
};
RadioButton RB_LF
{
+ HelpID = "sw:RadioButton:DLG_ASCII_FILTER:RB_LF";
Pos = MAP_APPFONT ( 155 , 64 ) ;
Size = MAP_APPFONT ( 20 , 10 ) ;
// TabStop = TRUE ;
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index e6bce47c62..cf6319600d 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -61,25 +61,23 @@ SfxTabPage * SwDocStatPage::Create(Window *pParent, const SfxItemSet &rSet)
SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
SfxTabPage (pParent, SW_RES(TP_DOC_STAT), rSet),
-
- aTableLbl (this, SW_RES( FT_TABLE )),
- aGrfLbl (this, SW_RES( FT_GRF )),
- aOLELbl (this, SW_RES( FT_OLE )),
aPageLbl (this, SW_RES( FT_PAGE )),
- aParaLbl (this, SW_RES( FT_PARA )),
- aWordLbl (this, SW_RES( FT_WORD )),
- aCharLbl (this, SW_RES( FT_CHAR )),
- aCharExclSpacesLbl (this, SW_RES( FT_CHAR_EXCL_SPACES )),
- aLineLbl (this, SW_RES( FT_LINE )),
-
+ aPageNo (this, SW_RES( FT_PAGE_COUNT )),
+ aTableLbl (this, SW_RES( FT_TABLE )),
aTableNo (this, SW_RES( FT_TABLE_COUNT)),
+ aGrfLbl (this, SW_RES( FT_GRF )),
aGrfNo (this, SW_RES( FT_GRF_COUNT )),
+ aOLELbl (this, SW_RES( FT_OLE )),
aOLENo (this, SW_RES( FT_OLE_COUNT )),
- aPageNo (this, SW_RES( FT_PAGE_COUNT )),
+ aParaLbl (this, SW_RES( FT_PARA )),
aParaNo (this, SW_RES( FT_PARA_COUNT )),
+ aWordLbl (this, SW_RES( FT_WORD )),
aWordNo (this, SW_RES( FT_WORD_COUNT )),
+ aCharLbl (this, SW_RES( FT_CHAR )),
aCharNo (this, SW_RES( FT_CHAR_COUNT )),
+ aCharExclSpacesLbl (this, SW_RES( FT_CHAR_EXCL_SPACES )),
aCharExclSpacesNo (this, SW_RES( FT_CHAR_COUNT_EXCL_SPACES )),
+ aLineLbl (this, SW_RES( FT_LINE )),
aLineNo (this, SW_RES( FT_LINE_COUNT )),
aUpdatePB (this, SW_RES( PB_PDATE ))
{
@@ -91,9 +89,9 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
SwFEShell* pFEShell = pDocShell->GetFEShell();
if(!pFEShell)
{
- aUpdatePB.Show(FALSE);
- aLineLbl.Show(FALSE);
- aLineNo .Show(FALSE);
+ aUpdatePB.Show(sal_False);
+ aLineLbl.Show(sal_False);
+ aLineNo .Show(sal_False);
}
}
@@ -108,9 +106,9 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
--------------------------------------------------------------------*/
-BOOL SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/)
+sal_Bool SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/)
{
- return FALSE;
+ return sal_False;
}
void SwDocStatPage::Reset(const SfxItemSet &/*rSet*/)
@@ -149,7 +147,7 @@ void SwDocStatPage::Update()
OSL_ENSURE( pSh, "Shell not found" );
- SwWait aWait( *pSh->GetDoc()->GetDocShell(), TRUE );
+ SwWait aWait( *pSh->GetDoc()->GetDocShell(), sal_True );
pSh->StartAction();
aDocStat = pSh->GetDoc()->GetDocStat();
pSh->GetDoc()->UpdateDocStat( aDocStat );
@@ -167,7 +165,7 @@ IMPL_LINK( SwDocStatPage, UpdateHdl, PushButton*, EMPTYARG)
SwDocShell* pDocShell = (SwDocShell*) SfxObjectShell::Current();
SwFEShell* pFEShell = pDocShell->GetFEShell();
if(pFEShell)
- aLineNo.SetText( String::CreateFromInt32( pFEShell->GetLineCount(FALSE)));
+ aLineNo.SetText( String::CreateFromInt32( pFEShell->GetLineCount(sal_False)));
//pButton->Disable();
return 0;
}
diff --git a/sw/source/ui/dialog/docstdlg.hrc b/sw/source/ui/dialog/docstdlg.hrc
index ccd79a5c8a..e1b5762d90 100644
--- a/sw/source/ui/dialog/docstdlg.hrc
+++ b/sw/source/ui/dialog/docstdlg.hrc
@@ -32,7 +32,6 @@
#define FT_PARA 5
#define FT_WORD 6
#define FT_CHAR 9
-#define FT_CHAR_EXCL_SPACES 21
#define FT_TABLE_COUNT 10
#define FT_GRF_COUNT 11
#define FT_OLE_COUNT 12
@@ -40,10 +39,11 @@
#define FT_PARA_COUNT 14
#define FT_WORD_COUNT 15
#define FT_CHAR_COUNT 16
-#define FT_CHAR_COUNT_EXCL_SPACES 20
#define FT_LINE 17
#define FT_LINE_COUNT 18
#define PB_PDATE 19
+#define FT_CHAR_COUNT_EXCL_SPACES 20
+#define FT_CHAR_EXCL_SPACES 21
#define BT_OK 100
diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src
index 456316aed0..97dbdddff7 100644
--- a/sw/source/ui/dialog/docstdlg.src
+++ b/sw/source/ui/dialog/docstdlg.src
@@ -153,6 +153,7 @@ TabPage TP_DOC_STAT
};
PushButton PB_PDATE
{
+ HelpID = "sw:PushButton:TP_DOC_STAT:PB_PDATE";
Pos = MAP_APPFONT ( 204 , 108 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Update" ;
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 6daac06469..69b8d43773 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -64,9 +64,9 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
{
SfxEventNamesItem aItem(SID_EVENTCONFIG);
- BOOL bHtmlMode = FALSE;
- USHORT nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
- bHtmlMode = nHtmlMode & HTMLMODE_ON ? TRUE : FALSE;
+ sal_Bool bHtmlMode = sal_False;
+ sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
+ bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False;
switch( eType )
{
@@ -127,10 +127,10 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
}
-BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh,
+sal_Bool SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh,
SvxMacroItem*& rpINetItem )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
SfxItemSet aSet( rSh.GetAttrPool(), RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 );
SvxMacroItem aItem( RES_FRMMACRO );
if( !rpINetItem )
@@ -149,13 +149,13 @@ BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh,
{
const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pOutSet->GetItemState( RES_FRMMACRO, FALSE, &pItem ))
+ if( SFX_ITEM_SET == pOutSet->GetItemState( RES_FRMMACRO, sal_False, &pItem ))
{
rpINetItem->SetMacroTable( ((SvxMacroItem*)pItem)->GetMacroTable() );
- bRet = TRUE;
+ bRet = sal_True;
}
}
return bRet;
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk
deleted file mode 100644
index 033703f686..0000000000
--- a/sw/source/ui/dialog/makefile.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=dialog
-LIBTARGET=no
-
-# future: DEMO\dialog.srs
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/inc$/swpre.mk
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- abstract.src \
- ascfldlg.src \
- dialog.src \
- docstdlg.src \
- regionsw.src \
- wordcountdialog.src
-
-EXCEPTIONSFILES = \
- $(SLO)$/SwSpellDialogChildWindow.obj \
- $(SLO)$/abstract.obj \
- $(SLO)$/addrdlg.obj \
- $(SLO)$/ascfldlg.obj \
- $(SLO)$/docstdlg.obj \
- $(SLO)$/macassgn.obj \
- $(SLO)$/regionsw.obj \
- $(SLO)$/swabstdlg.obj \
- $(SLO)$/swdialmgr.obj \
- $(SLO)$/swdlgfact.obj \
- $(SLO)$/swuiexp.obj \
- $(SLO)$/uiregionsw.obj \
- $(SLO)$/wordcountdialog.obj
-
-SLOFILES = \
- $(EXCEPTIONSFILES) \
- $(SLO)$/swwrtshitem.obj
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES = \
- $(SLO)$/regionsw.obj \
- $(SLO)$/swabstdlg.obj \
- $(SLO)$/SwSpellDialogChildWindow.obj \
- $(SLO)$/swwrtshitem.obj
-
-# $(SLO)$/macassgn.obj \
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
-$(INCCOM)$/swuilib.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
- $(RM) $@
- echo \#define DLL_NAME \"libswui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
- echo \#define DLL_NAME \"swui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ENDIF
-
-$(SLO)$/swabstdlg.obj : $(INCCOM)$/swuilib.hxx
-
-
-
-
-
-
-
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index d4a237d9e9..fe6d9132de 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -107,7 +107,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
const SfxPoolItem *pItem = 0;
String aTmpStr;
if ( SFX_ITEM_SET ==
- pSet->GetItemState(FN_PARAM_REGION_NAME, TRUE, &pItem) )
+ pSet->GetItemState(FN_PARAM_REGION_NAME, sal_True, &pItem) )
aTmpStr = rSh.GetUniqueSectionName(
&((const SfxStringItem *)pItem)->GetValue() );
else
@@ -117,36 +117,36 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
rReq.SetReturnValue(SfxStringItem(FN_INSERT_REGION, aTmpStr));
aSet.Put( *pSet );
- if(SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_COLUMNS, FALSE, &pItem)||
- SFX_ITEM_SET == pSet->GetItemState(FN_INSERT_REGION, FALSE, &pItem))
+ if(SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_COLUMNS, sal_False, &pItem)||
+ SFX_ITEM_SET == pSet->GetItemState(FN_INSERT_REGION, sal_False, &pItem))
{
SwFmtCol aCol;
SwRect aRect;
rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
long nWidth = aRect.Width();
- USHORT nCol = ((SfxUInt16Item *)pItem)->GetValue();
+ sal_uInt16 nCol = ((SfxUInt16Item *)pItem)->GetValue();
if(nCol)
{
- aCol.Init( nCol, 0, static_cast< USHORT >(nWidth) );
+ aCol.Init( nCol, 0, static_cast< sal_uInt16 >(nWidth) );
aSet.Put(aCol);
}
}
- else if(SFX_ITEM_SET == pSet->GetItemState(RES_COL, FALSE, &pItem))
+ else if(SFX_ITEM_SET == pSet->GetItemState(RES_COL, sal_False, &pItem))
{
aSet.Put(*pItem);
}
- const BOOL bHidden = SFX_ITEM_SET ==
- pSet->GetItemState(FN_PARAM_REGION_HIDDEN, TRUE, &pItem)?
- (BOOL)((const SfxBoolItem *)pItem)->GetValue():FALSE;
- const BOOL bProtect = SFX_ITEM_SET ==
- pSet->GetItemState(FN_PARAM_REGION_PROTECT, TRUE, &pItem)?
- (BOOL)((const SfxBoolItem *)pItem)->GetValue():FALSE;
+ const sal_Bool bHidden = SFX_ITEM_SET ==
+ pSet->GetItemState(FN_PARAM_REGION_HIDDEN, sal_True, &pItem)?
+ (sal_Bool)((const SfxBoolItem *)pItem)->GetValue():sal_False;
+ const sal_Bool bProtect = SFX_ITEM_SET ==
+ pSet->GetItemState(FN_PARAM_REGION_PROTECT, sal_True, &pItem)?
+ (sal_Bool)((const SfxBoolItem *)pItem)->GetValue():sal_False;
// #114856# edit in readonly sections
- const BOOL bEditInReadonly = SFX_ITEM_SET ==
- pSet->GetItemState(FN_PARAM_REGION_EDIT_IN_READONLY, TRUE, &pItem)?
- (BOOL)((const SfxBoolItem *)pItem)->GetValue():FALSE;
+ const sal_Bool bEditInReadonly = SFX_ITEM_SET ==
+ pSet->GetItemState(FN_PARAM_REGION_EDIT_IN_READONLY, sal_True, &pItem)?
+ (sal_Bool)((const SfxBoolItem *)pItem)->GetValue():sal_False;
aSection.SetProtectFlag(bProtect);
aSection.SetHidden(bHidden);
@@ -154,16 +154,16 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
aSection.SetEditInReadonlyFlag(bEditInReadonly);
if(SFX_ITEM_SET ==
- pSet->GetItemState(FN_PARAM_REGION_CONDITION, TRUE, &pItem))
+ pSet->GetItemState(FN_PARAM_REGION_CONDITION, sal_True, &pItem))
aSection.SetCondition(((const SfxStringItem *)pItem)->GetValue());
String aFile, aSub;
if(SFX_ITEM_SET ==
- pSet->GetItemState(FN_PARAM_1, TRUE, &pItem))
+ pSet->GetItemState(FN_PARAM_1, sal_True, &pItem))
aFile = ((const SfxStringItem *)pItem)->GetValue();
if(SFX_ITEM_SET ==
- pSet->GetItemState(FN_PARAM_3, TRUE, &pItem))
+ pSet->GetItemState(FN_PARAM_3, sal_True, &pItem))
aSub = ((const SfxStringItem *)pItem)->GetValue();
@@ -174,7 +174,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
sLinkFileName.SetToken(0, sfx2::cTokenSeperator,aFile);
if(SFX_ITEM_SET ==
- pSet->GetItemState(FN_PARAM_2, TRUE, &pItem))
+ pSet->GetItemState(FN_PARAM_2, sal_True, &pItem))
sLinkFileName.SetToken(1, sfx2::cTokenSeperator,
((const SfxStringItem *)pItem)->GetValue());
@@ -220,10 +220,10 @@ IMPL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData*, pSect )
void SwBaseShell::EditRegionDialog(SfxRequest& rReq)
{
const SfxItemSet* pArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ sal_uInt16 nSlot = rReq.GetSlot();
const SfxPoolItem* pItem = 0;
if(pArgs)
- pArgs->GetItemState(nSlot, FALSE, &pItem);
+ pArgs->GetItemState(nSlot, sal_False, &pItem);
SwWrtShell& rWrtShell = GetShell();
switch ( nSlot )
@@ -231,7 +231,7 @@ void SwBaseShell::EditRegionDialog(SfxRequest& rReq)
case FN_EDIT_REGION:
{
Window* pParentWin = &GetView().GetViewFrame()->GetWindow();
- BOOL bStart = TRUE;
+ sal_Bool bStart = sal_True;
if(bStart)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index 428cf45198..8f249a890f 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -87,7 +87,7 @@
*************************************************************************/
ModalDialog MD_EDIT_REGION
{
- HelpID = FN_EDIT_REGION ;
+ HelpID = CMD_FN_EDIT_REGION ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 316 , 185 ) ;
@@ -102,6 +102,7 @@ ModalDialog MD_EDIT_REGION
};
Edit ED_RANAME
{
+ HelpID = "sw:Edit:MD_EDIT_REGION:ED_RANAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 71 , 12 ) ;
@@ -124,6 +125,7 @@ ModalDialog MD_EDIT_REGION
};
TriStateBox CB_FILE
{
+ HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_FILE";
Pos = MAP_APPFONT ( 98 , 14 ) ;
Size = MAP_APPFONT ( 59 , 10 ) ;
TabStop = TRUE ;
@@ -131,6 +133,7 @@ ModalDialog MD_EDIT_REGION
};
CheckBox CB_DDE
{
+ HelpID = "sw:CheckBox:MD_EDIT_REGION:CB_DDE";
Pos = MAP_APPFONT ( 98 , 28 ) ;
Size = MAP_APPFONT ( 30 , 10 ) ;
Disable = TRUE ;
@@ -152,6 +155,7 @@ ModalDialog MD_EDIT_REGION
};
Edit ED_FILE
{
+ HelpID = "sw:Edit:MD_EDIT_REGION:ED_FILE";
Border = TRUE ;
Pos = MAP_APPFONT ( 165 , 42 ) ;
Size = MAP_APPFONT ( 68 , 12 ) ;
@@ -160,6 +164,7 @@ ModalDialog MD_EDIT_REGION
};
PushButton PB_FILE
{
+ HelpID = "sw:PushButton:MD_EDIT_REGION:PB_FILE";
Pos = MAP_APPFONT ( 239 , 42 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
@@ -175,6 +180,7 @@ ModalDialog MD_EDIT_REGION
};
ComboBox LB_SUBREG
{
+ HelpID = "sw:ComboBox:MD_EDIT_REGION:LB_SUBREG";
Pos = MAP_APPFONT ( 165 , 57 ) ;
Size = MAP_APPFONT ( 68 , 50 ) ;
Disable = TRUE ;
@@ -191,6 +197,7 @@ ModalDialog MD_EDIT_REGION
};
TriStateBox CB_PROTECT
{
+ HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_PROTECT";
Pos = MAP_APPFONT ( 98 , 86 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
TabStop = TRUE ;
@@ -200,6 +207,7 @@ ModalDialog MD_EDIT_REGION
};
CheckBox CB_PASSWD
{
+ HelpID = "sw:CheckBox:MD_EDIT_REGION:CB_PASSWD";
Pos = MAP_APPFONT ( 107 , 100 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -207,6 +215,7 @@ ModalDialog MD_EDIT_REGION
};
PushButton PB_PASSWD
{
+ HelpID = "sw:PushButton:MD_EDIT_REGION:PB_PASSWD";
Pos = MAP_APPFONT ( 239 , 98 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
@@ -221,6 +230,7 @@ ModalDialog MD_EDIT_REGION
};
TriStateBox CB_HIDE
{
+ HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_HIDE";
Pos = MAP_APPFONT ( 98 , 127 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
TabStop = TRUE ;
@@ -236,6 +246,7 @@ ModalDialog MD_EDIT_REGION
};
Edit ED_CONDITION
{
+ HelpID = "sw:Edit:MD_EDIT_REGION:ED_CONDITION";
Border = TRUE ;
Pos = MAP_APPFONT ( 165 , 141) ;
Size = MAP_APPFONT ( 86 , 12 ) ;
@@ -252,6 +263,7 @@ ModalDialog MD_EDIT_REGION
};
TriStateBox CB_EDIT_IN_READONLY
{
+ HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_EDIT_IN_READONLY";
Pos = MAP_APPFONT ( 98 , 170 ) ;
Size = MAP_APPFONT ( 156 , 10 ) ;
TabStop = TRUE ;
@@ -275,6 +287,7 @@ ModalDialog MD_EDIT_REGION
};
PushButton PB_OPTIONS
{
+ HelpID = "sw:PushButton:MD_EDIT_REGION:PB_OPTIONS";
Pos = MAP_APPFONT ( 263 , 40 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -283,6 +296,7 @@ ModalDialog MD_EDIT_REGION
};
PushButton CB_DISMISS
{
+ HelpID = "sw:PushButton:MD_EDIT_REGION:CB_DISMISS";
Pos = MAP_APPFONT ( 263 , 57 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Disable = TRUE ;
@@ -406,6 +420,7 @@ TabPage TP_INSERT_SECTION
};
ComboBox ED_RNAME
{
+ HelpID = "sw:ComboBox:TP_INSERT_SECTION:ED_RNAME";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 69 , 140 ) ;
TabStop = TRUE ;
@@ -421,6 +436,7 @@ TabPage TP_INSERT_SECTION
};
CheckBox CB_FILE
{
+ HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_FILE";
Pos = MAP_APPFONT ( 96 , 14 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
TabStop = TRUE ;
@@ -428,6 +444,7 @@ TabPage TP_INSERT_SECTION
};
CheckBox CB_DDE
{
+ HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_DDE";
Pos = MAP_APPFONT ( 96 , 28) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Disable = TRUE ;
@@ -449,6 +466,7 @@ TabPage TP_INSERT_SECTION
};
Edit ED_FILE
{
+ HelpID = "sw:Edit:TP_INSERT_SECTION:ED_FILE";
Border = TRUE ;
Pos = MAP_APPFONT ( 160 , 42 ) ;
Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -457,6 +475,7 @@ TabPage TP_INSERT_SECTION
};
PushButton PB_FILE
{
+ HelpID = "sw:PushButton:TP_INSERT_SECTION:PB_FILE";
Pos = MAP_APPFONT ( 239 , 42 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Disable = TRUE ;
@@ -472,6 +491,7 @@ TabPage TP_INSERT_SECTION
};
ComboBox LB_SUBREG
{
+ HelpID = "sw:ComboBox:TP_INSERT_SECTION:LB_SUBREG";
Pos = MAP_APPFONT ( 160 , 58 ) ;
Size = MAP_APPFONT ( 76 , 50 ) ;
DropDown = TRUE ;
@@ -488,6 +508,7 @@ TabPage TP_INSERT_SECTION
};
CheckBox CB_PROTECT
{
+ HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_PROTECT";
Pos = MAP_APPFONT ( 96 , 87 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -495,6 +516,7 @@ TabPage TP_INSERT_SECTION
};
CheckBox CB_PASSWD
{
+ HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_PASSWD";
Pos = MAP_APPFONT ( 105 , 101 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -502,6 +524,7 @@ TabPage TP_INSERT_SECTION
};
PushButton PB_PASSWD
{
+ HelpID = "sw:PushButton:TP_INSERT_SECTION:PB_PASSWD";
Pos = MAP_APPFONT ( 239 , 99 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
@@ -516,6 +539,7 @@ TabPage TP_INSERT_SECTION
};
CheckBox CB_HIDE
{
+ HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_HIDE";
Pos = MAP_APPFONT ( 96 , 128 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
CB_HIDE_TEXT
@@ -529,6 +553,7 @@ TabPage TP_INSERT_SECTION
};
Edit ED_CONDITION
{
+ HelpID = "sw:Edit:TP_INSERT_SECTION:ED_CONDITION";
Border = TRUE ;
Pos = MAP_APPFONT ( 160 , 142 ) ;
Size = MAP_APPFONT ( 91 , 12 ) ;
@@ -545,6 +570,7 @@ TabPage TP_INSERT_SECTION
};
CheckBox CB_EDIT_IN_READONLY
{
+ HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_EDIT_IN_READONLY";
Pos = MAP_APPFONT ( 96 , 170 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
CB_EDIT_IN_READONLY_TEXT
@@ -609,6 +635,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
CheckBox CB_FTN_AT_TXTEND
{
+ HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
TabStop = TRUE ;
@@ -617,6 +644,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
CheckBox CB_FTN_NUM
{
+ HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM";
Pos = MAP_APPFONT ( 18 , 29 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -631,6 +659,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
NumericField FLD_FTN_OFFSET
{
+ HelpID = "sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET";
Pos = MAP_APPFONT ( 90 , 44 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Spin = TRUE ;
@@ -643,6 +672,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
CheckBox CB_FTN_NUM_FMT
{
+ HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT";
Pos = MAP_APPFONT ( 24 , 61 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -657,6 +687,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
Edit ED_FTN_PREFIX
{
+ HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX";
Border = TRUE ;
Pos = MAP_APPFONT ( 90 , 74 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -666,6 +697,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
ListBox LB_FTN_NUMVIEW
{
+ HelpID = "sw:ListBox:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW";
Border = TRUE ;
Pos = MAP_APPFONT ( 123 , 74 ) ;
Size = MAP_APPFONT ( 62 , 50 ) ;
@@ -682,6 +714,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
Edit ED_FTN_SUFFIX
{
+ HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX";
Border = TRUE ;
Pos = MAP_APPFONT ( 219 , 74 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -700,6 +733,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
CheckBox CB_END_AT_TXTEND
{
+ HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND";
Pos = MAP_APPFONT ( 12 , 103 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -707,6 +741,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
CheckBox CB_END_NUM
{
+ HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM";
Pos = MAP_APPFONT ( 16 , 118 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -721,6 +756,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
NumericField FLD_END_OFFSET
{
+ HelpID = "sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET";
Pos = MAP_APPFONT ( 90 , 133 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Spin = TRUE ;
@@ -733,6 +769,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
CheckBox CB_END_NUM_FMT
{
+ HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT";
Pos = MAP_APPFONT ( 24 , 150 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -748,6 +785,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
Edit ED_END_PREFIX
{
+ HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_PREFIX";
Border = TRUE ;
Pos = MAP_APPFONT ( 90 , 163 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -757,6 +795,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
ListBox LB_END_NUMVIEW
{
+ HelpID = "sw:ListBox:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW";
Border = TRUE ;
Pos = MAP_APPFONT ( 123 , 163 ) ;
Size = MAP_APPFONT ( 62 , 50 ) ;
@@ -774,6 +813,7 @@ TabPage TP_SECTION_FTNENDNOTES
};
Edit ED_END_SUFFIX
{
+ HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX";
Border = TRUE ;
Pos = MAP_APPFONT ( 219 , 163 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -805,6 +845,7 @@ TabPage TP_SECTION_INDENTS
};
MetricField MF_BEFORE
{
+ HelpID = "sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE";
Border = TRUE ;
Pos = MAP_APPFONT ( 135 , 14 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -828,6 +869,7 @@ TabPage TP_SECTION_INDENTS
};
MetricField MF_AFTER
{
+ HelpID = "sw:MetricField:TP_SECTION_INDENTS:MF_AFTER";
Border = TRUE ;
Pos = MAP_APPFONT ( 135 , 30 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx
index f6f9756a85..4b8de38dee 100644
--- a/sw/source/ui/dialog/swabstdlg.cxx
+++ b/sw/source/ui/dialog/swabstdlg.cxx
@@ -30,10 +30,10 @@
#include "precompiled_sw.hxx"
#include "swabstdlg.hxx"
-#include "swuilib.hxx"
#include <osl/module.hxx>
#include <tools/string.hxx>
+#include <vcl/unohelp.hxx>
typedef SwAbstractDialogFactory* (__LOADONCALLAPI *SwFuncPtrCreateDialogFactory)();
@@ -43,7 +43,8 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
{
SwFuncPtrCreateDialogFactory fp = 0;
static ::osl::Module aDialogLibrary;
- if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
+ static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True));
+ if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ) ) )
fp = ( SwAbstractDialogFactory* (__LOADONCALLAPI*)() )
aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")));
if ( fp )
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index d943911d32..96cd7eae99 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -144,7 +144,7 @@ IMPL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl);
-void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
+void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
@@ -154,7 +154,7 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
-const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
@@ -180,12 +180,11 @@ void AbstractSwWordCountDialog_Impl::SetValues(const SwDocStat& rCurrent, con
pDlg->SetValues(rCurrent, rDoc);
}
-BYTE AbstractSwInsertAbstractDlg_Impl::GetLevel() const
+sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetLevel() const
{
return pDlg->GetLevel();
}
-
-BYTE AbstractSwInsertAbstractDlg_Impl::GetPara() const
+sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetPara() const
{
return pDlg->GetPara();
}
@@ -221,12 +220,12 @@ String AbstractSwBreakDlg_Impl::GetTemplateName()
return pDlg->GetTemplateName();
}
-USHORT AbstractSwBreakDlg_Impl:: GetKind()
+sal_uInt16 AbstractSwBreakDlg_Impl:: GetKind()
{
return pDlg->GetKind();
}
-USHORT AbstractSwBreakDlg_Impl:: GetPageNumber()
+sal_uInt16 AbstractSwBreakDlg_Impl:: GetPageNumber()
{
return pDlg->GetPageNumber();
}
@@ -245,7 +244,7 @@ void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( const uno::Sequence< uno::A
pDlg->DataToDoc(rSelection, rxSource, xConnection, xResultSet);
}
-ByteString AbstractDropDownFieldDialog_Impl::GetWindowState( ULONG nMask ) const
+ByteString AbstractDropDownFieldDialog_Impl::GetWindowState( sal_uLong nMask ) const
{
return pDlg->GetWindowState(nMask);
}
@@ -255,7 +254,7 @@ void AbstractDropDownFieldDialog_Impl::SetWindowState( const ByteString& r
pDlg->SetWindowState(rStr);
}
-void AbstractSwLabDlg_Impl::SetCurPageId( USHORT nId )
+void AbstractSwLabDlg_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
@@ -265,7 +264,7 @@ const SfxItemSet* AbstractSwLabDlg_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
-const USHORT* AbstractSwLabDlg_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractSwLabDlg_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
@@ -300,12 +299,12 @@ void AbstractSwSelGlossaryDlg_Impl::InsertGlos(const String &rRegion, const Stri
pDlg->InsertGlos( rRegion, rGlosName );
}
-USHORT AbstractSwSelGlossaryDlg_Impl::GetSelectedIdx() const
+sal_uInt16 AbstractSwSelGlossaryDlg_Impl::GetSelectedIdx() const
{
return pDlg->GetSelectedIdx();
}
-void AbstractSwSelGlossaryDlg_Impl::SelectEntryPos(USHORT nIdx)
+void AbstractSwSelGlossaryDlg_Impl::SelectEntryPos(sal_uInt16 nIdx)
{
pDlg->SelectEntryPos( nIdx );
}
@@ -315,7 +314,7 @@ void AbstractSwAutoFormatDlg_Impl::FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill
pDlg->FillAutoFmtOfIndex(rToFill);
}
-void AbstractSwFldDlg_Impl::SetCurPageId( USHORT nId )
+void AbstractSwFldDlg_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
@@ -325,7 +324,7 @@ const SfxItemSet* AbstractSwFldDlg_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
-const USHORT* AbstractSwFldDlg_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractSwFldDlg_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
@@ -345,7 +344,7 @@ String AbstractSwFldDlg_Impl::GetText() const
return pDlg->GetText();
}
-void AbstractSwFldDlg_Impl::Start( BOOL bShowl )
+void AbstractSwFldDlg_Impl::Start( sal_Bool bShowl )
{
pDlg->Start( bShowl );
}
@@ -369,8 +368,7 @@ Window* AbstractSwFldDlg_Impl::GetWindow()
{
return (Window*)pDlg;
}
-
-void AbstractSwFldDlg_Impl::ShowPage( USHORT nId )
+void AbstractSwFldDlg_Impl::ShowPage( sal_uInt16 nId )
{
pDlg->ShowPage(nId);
}
@@ -387,7 +385,7 @@ void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess(
pDlg->SetAlternativeAccess( xSecond, xThird);
}
-void AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( BOOL bAccept )
+void AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( sal_Bool bAccept )
{
pDlg->AcceptAll( bAccept);
}
@@ -407,7 +405,7 @@ void AbstractFldInputDlg_Impl::SetWindowState( const ByteString& rStr )
pDlg->SetWindowState( rStr );
}
-ByteString AbstractFldInputDlg_Impl::GetWindowState( ULONG nMask ) const
+ByteString AbstractFldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const
{
return pDlg->GetWindowState( nMask );
}
@@ -416,8 +414,7 @@ String AbstractInsFootNoteDlg_Impl::GetFontName()
{
return pDlg->GetFontName();
}
-
-BOOL AbstractInsFootNoteDlg_Impl::IsEndNote()
+sal_Bool AbstractInsFootNoteDlg_Impl::IsEndNote()
{
return pDlg->IsEndNote();
}
@@ -426,10 +423,9 @@ String AbstractInsFootNoteDlg_Impl::GetStr()
{
return pDlg->GetStr();
}
-
-void AbstractInsFootNoteDlg_Impl::SetHelpId( ULONG nHelpId )
+void AbstractInsFootNoteDlg_Impl::SetHelpId( const rtl::OString& sHelpId )
{
- pDlg->SetHelpId( nHelpId );
+ pDlg->SetHelpId( sHelpId );
}
void AbstractInsFootNoteDlg_Impl::SetText( const XubString& rStr )
@@ -441,18 +437,16 @@ String AbstractInsertGrfRulerDlg_Impl::GetGraphicName()
{
return pDlg->GetGraphicName();
}
-
-BOOL AbstractInsertGrfRulerDlg_Impl::IsSimpleLine()
+sal_Bool AbstractInsertGrfRulerDlg_Impl::IsSimpleLine()
{
return pDlg->IsSimpleLine();
}
-
-BOOL AbstractInsertGrfRulerDlg_Impl::HasImages() const
+sal_Bool AbstractInsertGrfRulerDlg_Impl::HasImages() const
{
return pDlg->HasImages();
}
-void AbstractInsTableDlg_Impl::GetValues( String& rName, USHORT& rRow, USHORT& rCol,
+void AbstractInsTableDlg_Impl::GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
SwTableAutoFmt *& prTAFmt )
{
@@ -468,23 +462,20 @@ String AbstractJavaEditDialog_Impl::GetType()
{
return pDlg->GetType();
}
-
-BOOL AbstractJavaEditDialog_Impl::IsUrl()
+sal_Bool AbstractJavaEditDialog_Impl::IsUrl()
{
return pDlg->IsUrl();
}
-
-BOOL AbstractJavaEditDialog_Impl::IsNew()
+sal_Bool AbstractJavaEditDialog_Impl::IsNew()
{
return pDlg->IsNew();
}
-
-BOOL AbstractJavaEditDialog_Impl::IsUpdate()
+sal_Bool AbstractJavaEditDialog_Impl::IsUpdate()
{
return pDlg->IsUpdate();
}
-USHORT AbstractMailMergeDlg_Impl::GetMergeType()
+sal_uInt16 AbstractMailMergeDlg_Impl::GetMergeType()
{
return pDlg->GetMergeType();
}
@@ -504,12 +495,12 @@ uno::Reference< sdbc::XResultSet> AbstractMailMergeDlg_Impl::GetResultSet() cons
return pDlg->GetResultSet();
}
-BOOL AbstractMailMergeCreateFromDlg_Impl::IsThisDocument() const
+sal_Bool AbstractMailMergeCreateFromDlg_Impl::IsThisDocument() const
{
return pDlg->IsThisDocument();
}
-BOOL AbstractMailMergeFieldConnectionsDlg_Impl::IsUseExistingConnections() const
+sal_Bool AbstractMailMergeFieldConnectionsDlg_Impl::IsUseExistingConnections() const
{
return pDlg->IsUseExistingConnections();
}
@@ -607,8 +598,7 @@ const String& AbstractMailMergeWizard_Impl::GetReloadDocument() const
{
return pDlg->GetReloadDocument();
}
-
-BOOL AbstractMailMergeWizard_Impl::ShowPage( USHORT nLevel )
+sal_Bool AbstractMailMergeWizard_Impl::ShowPage( sal_uInt16 nLevel )
{
return pDlg->skipUntil(nLevel);
}
@@ -754,7 +744,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg( SwView& r
SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg
- const String* pFmtStr , BOOL bIsDrwTxtDlg )
+ const String* pFmtStr , sal_Bool bIsDrwTxtDlg )
{
SfxTabDialog* pDlg=NULL;
@@ -849,7 +839,7 @@ SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(
}
AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog ( Window *pParent, SwWrtShell &rSh, //add for DropDownFieldDialog
- SwField* pField,int nResId, BOOL bNextButton )
+ SwField* pField,int nResId, sal_Bool bNextButton )
{
sw::DropDownFieldDialog* pDlg=NULL;
switch ( nResId )
@@ -869,7 +859,7 @@ AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownField
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet,
SwWrtShell* pWrtSh, Printer* pPrt,
- BOOL bInsert,int nResId ) //add for SwEnvDlg
+ sal_Bool bInsert,int nResId ) //add for SwEnvDlg
{
SfxTabDialog* pDlg=NULL;
switch ( nResId )
@@ -888,7 +878,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pPa
}
AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
- SwNewDBMgr* pNewDBMgr, BOOL bLabel,int nResId )
+ SwNewDBMgr* pNewDBMgr, sal_Bool bLabel,int nResId )
{
SwLabDlg* pDlg=NULL;
switch ( nResId )
@@ -914,10 +904,10 @@ SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod ()
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pParent, SwView& rVw,
const SfxItemSet& rCoreSet ,
- BYTE nDialogMode,
+ sal_uInt8 nDialogMode,
int nResId,
const String *pCollName,
- BOOL bDraw , UINT16 nDefPage)
+ sal_Bool bDraw , sal_uInt16 nDefPage)
{
SfxTabDialog* pDlg=NULL;
switch ( nResId )
@@ -988,7 +978,7 @@ AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg
AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
int nResId,
- BOOL bSetAutoFmt,
+ sal_Bool bSetAutoFmt,
const SwTableAutoFmt* pSelFmt )
{
SwAutoFormatDlg* pDlg=NULL;
@@ -1007,7 +997,7 @@ AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg( W
return 0;
}
-SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, USHORT nType,int nResId )
+SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType,int nResId )
{
SfxModalDialog* pDlg=NULL;
switch ( nResId )
@@ -1024,7 +1014,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pPa
return 0;
}
-SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId )
+SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId )
{
SfxModalDialog* pDlg=NULL;
switch ( nResId )
@@ -1150,7 +1140,7 @@ AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRed
}
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId,
- Window* pParent, BOOL& rWithPrev ) //add for SwMergeTblDlg
+ Window* pParent, sal_Bool& rWithPrev ) //add for SwMergeTblDlg
{
Dialog* pDlg=NULL;
switch ( nResId )
@@ -1169,10 +1159,10 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId,
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog( int nResId,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
- BOOL bNewFrm,
- USHORT nResType,
- BOOL bFmt,
- UINT16 nDefPage,
+ sal_Bool bNewFrm,
+ sal_uInt16 nResType,
+ sal_Bool bFmt,
+ sal_uInt16 nDefPage,
const String* pFmtStr ) //add for SwFrmDlg
{
SfxTabDialog* pDlg=NULL;
@@ -1195,10 +1185,10 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog( int nRes
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( int nResId,
Window* pParent,
SfxStyleSheetBase& rBase,
- USHORT nRegion,
- BOOL bColumn,
+ sal_uInt16 nRegion,
+ sal_Bool bColumn,
SwWrtShell* pActShell,
- BOOL bNew ) //add for SwTemplateDlg
+ sal_Bool bNew ) //add for SwTemplateDlg
{
SfxTabDialog* pDlg=NULL;
switch ( nResId )
@@ -1236,7 +1226,7 @@ AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg( int nResId
AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg( int nResId,
Window *pParent, SwWrtShell &rSh,
- SwField* pField, BOOL bNextButton ) //add for SwFldInputDlg
+ SwField* pField, sal_Bool bNextButton ) //add for SwFldInputDlg
{
SwFldInputDlg* pDlg=NULL;
switch ( nResId )
@@ -1253,7 +1243,7 @@ AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg( int nResId
}
AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg( int nResId,
- Window * pParent, SwWrtShell &rSh, BOOL bEd ) //add for SwInsFootNoteDlg
+ Window * pParent, SwWrtShell &rSh, sal_Bool bEd ) //add for SwInsFootNoteDlg
{
SwInsFootNoteDlg* pDlg=NULL;
switch ( nResId )
@@ -1278,7 +1268,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( Window *p
}
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId,
- SwView& rView, BOOL /*bCol*/ ) //add for SwInsRowColDlg, SwLineNumberingDlg
+ SwView& rView, sal_Bool /*bCol*/ ) //add for SwInsRowColDlg, SwLineNumberingDlg
{
Dialog* pDlg=NULL;
switch ( nResId )
@@ -1446,8 +1436,8 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResI
AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( int nResId,
Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
- SwTOXBase* pCurTOX, USHORT nToxType,
- BOOL bGlobal ) //add for SwMultiTOXTabDialog
+ SwTOXBase* pCurTOX, sal_uInt16 nToxType,
+ sal_Bool bGlobal ) //add for SwMultiTOXTabDialog
{
SwMultiTOXTabDialog* pDlg=NULL;
switch ( nResId )
@@ -1569,7 +1559,7 @@ AbstractMailMergeWizard* SwAbstractDialogFactory_Impl::CreateMailMergeWizard(
}
//add for static func in SwGlossaryDlg
-GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc( USHORT nId )
+GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc( sal_uInt16 nId )
{
switch ( nId )
{
@@ -1580,7 +1570,7 @@ GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc( USH
}
return 0;
}
-GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHORT nId )
+GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( sal_uInt16 nId )
{
switch ( nId )
{
@@ -1593,7 +1583,7 @@ GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHOR
}
//------------------ Factories for TabPages
-CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
+CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId )
{
CreateTabPage pRet = 0;
switch ( nId )
@@ -1656,7 +1646,7 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
return pRet;
}
-GetTabPageRanges SwAbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId )
+GetTabPageRanges SwAbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nId )
{
switch ( nId )
{
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 29cf162d11..1f18e01eae 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -64,7 +64,7 @@ public: \
{} \
virtual ~Class(); \
virtual short Execute() ;
-// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
+// virtual void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 )
#define IMPL_ABSTDLG_BASE(Class) \
Class::~Class() \
@@ -87,8 +87,8 @@ class AbstractSwWordCountDialog_Impl : public AbstractSwWordCountDialog
class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
{
DECL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl,SwInsertAbstractDlg)
- virtual BYTE GetLevel() const ;
- virtual BYTE GetPara() const ;
+ virtual sal_uInt8 GetLevel() const ;
+ virtual sal_uInt8 GetPara() const ;
};
//add for SwInsertAbstractDlg end
@@ -125,8 +125,8 @@ class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg // add for SwBreakDlg
{
DECL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl,SwBreakDlg)
virtual String GetTemplateName();
- virtual USHORT GetKind();
- virtual USHORT GetPageNumber();
+ virtual sal_uInt16 GetKind();
+ virtual sal_uInt16 GetPageNumber();
};
class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
@@ -141,9 +141,9 @@ class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
class AbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
- virtual void SetCurPageId( USHORT nId );
+ virtual void SetCurPageId( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
virtual void SetText( const XubString& rStr );
@@ -175,7 +175,7 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil
class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //add for DropDownFieldDialog
{
DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog)
- virtual ByteString GetWindowState( ULONG nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow
+ virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow
virtual void SetWindowState( const ByteString& rStr );//this method inherit from SystemWindow
};
//add for DropDownFieldDialog end
@@ -184,9 +184,9 @@ class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //ad
class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
{
DECL_ABSTDLG_BASE(AbstractSwLabDlg_Impl,SwLabDlg)
- virtual void SetCurPageId( USHORT nId );
+ virtual void SetCurPageId( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
virtual void SetText( const XubString& rStr );
@@ -201,8 +201,8 @@ class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
{
DECL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl,SwSelGlossaryDlg)
virtual void InsertGlos(const String &rRegion, const String &rGlosName); // inline
- virtual USHORT GetSelectedIdx() const; // inline
- virtual void SelectEntryPos(USHORT nIdx); // inline
+ virtual sal_uInt16 GetSelectedIdx() const; // inline
+ virtual void SelectEntryPos(sal_uInt16 nIdx); // inline
};
//add for SwSelGlossaryDlg end
@@ -219,15 +219,15 @@ class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg
class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg
{
DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg )
- virtual void SetCurPageId( USHORT nId );
+ virtual void SetCurPageId( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
virtual void SetText( const XubString& rStr );
virtual String GetText() const;
- virtual void Start( BOOL bShow = TRUE ); //this method from SfxTabDialog
- virtual void ShowPage( USHORT nId );// this method from SfxTabDialog
+ virtual void Start( sal_Bool bShow = sal_True ); //this method from SfxTabDialog
+ virtual void ShowPage( sal_uInt16 nId );// this method from SfxTabDialog
virtual void Initialize(SfxChildWinInfo *pInfo);
virtual void ReInitDlg();
virtual void ActivateDatabasePage();
@@ -249,7 +249,7 @@ class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg
{
DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg )
- virtual void AcceptAll( BOOL bAccept );
+ virtual void AcceptAll( sal_Bool bAccept );
};
//add for SwModalRedlineAcceptDlg end
@@ -270,7 +270,7 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
DECL_ABSTDLG_BASE(AbstractFldInputDlg_Impl,SwFldInputDlg)
//from class SalFrame
virtual void SetWindowState( const ByteString& rStr ) ;
- virtual ByteString GetWindowState( ULONG nMask = WINDOWSTATE_MASK_ALL ) const ;
+ virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ;
};
//for SwFldInputDlg end
@@ -280,10 +280,10 @@ class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
{
DECL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl,SwInsFootNoteDlg)
virtual String GetFontName();
- virtual BOOL IsEndNote();
+ virtual sal_Bool IsEndNote();
virtual String GetStr();
//from class Window
- virtual void SetHelpId( ULONG nHelpId );
+ virtual void SetHelpId( const rtl::OString& sHelpId );
virtual void SetText( const XubString& rStr );
};
//for SwInsFootNoteDlg end
@@ -294,8 +294,8 @@ class AbstractInsertGrfRulerDlg_Impl : public AbstractInsertGrfRulerDlg
{
DECL_ABSTDLG_BASE(AbstractInsertGrfRulerDlg_Impl,SwInsertGrfRulerDlg)
virtual String GetGraphicName();
- virtual BOOL IsSimpleLine();
- virtual BOOL HasImages() const ;
+ virtual sal_Bool IsSimpleLine();
+ virtual sal_Bool HasImages() const ;
};
//for SwInsertGrfRulerDlg end
@@ -304,7 +304,7 @@ class SwInsTableDlg;
class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
{
DECL_ABSTDLG_BASE(AbstractInsTableDlg_Impl,SwInsTableDlg)
- virtual void GetValues( String& rName, USHORT& rRow, USHORT& rCol,
+ virtual void GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
SwTableAutoFmt *& prTAFmt );
};
@@ -317,9 +317,9 @@ class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog)
virtual String GetText();
virtual String GetType();
- virtual BOOL IsUrl();
- virtual BOOL IsNew();
- virtual BOOL IsUpdate();
+ virtual sal_Bool IsUrl();
+ virtual sal_Bool IsNew();
+ virtual sal_Bool IsUpdate();
};
//for SwJavaEditDialog end
@@ -328,7 +328,7 @@ class SwMailMergeDlg;
class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg)
- virtual USHORT GetMergeType() ;
+ virtual sal_uInt16 GetMergeType() ;
virtual const ::rtl::OUString& GetSaveFilter() const;
virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const ;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
@@ -339,7 +339,7 @@ class SwMailMergeCreateFromDlg;
class AbstractMailMergeCreateFromDlg_Impl : public AbstractMailMergeCreateFromDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeCreateFromDlg_Impl,SwMailMergeCreateFromDlg)
- virtual BOOL IsThisDocument() const ;
+ virtual sal_Bool IsThisDocument() const ;
};
//for SwMailMergeCreateFromDlg end
//for SwMailMergeFieldConnectionsDlg begin
@@ -347,7 +347,7 @@ class SwMailMergeFieldConnectionsDlg;
class AbstractMailMergeFieldConnectionsDlg_Impl : public AbstractMailMergeFieldConnectionsDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeFieldConnectionsDlg_Impl,SwMailMergeFieldConnectionsDlg)
- virtual BOOL IsUseExistingConnections() const ;
+ virtual sal_Bool IsUseExistingConnections() const ;
};
//for SwMailMergeFieldConnectionsDlg end
@@ -418,7 +418,7 @@ public:
virtual void SetReloadDocument(const String& rURL);
virtual const String& GetReloadDocument() const;
- virtual BOOL ShowPage( USHORT nLevel );
+ virtual sal_Bool ShowPage( sal_uInt16 nLevel );
virtual sal_uInt16 GetRestartPage() const;
};
@@ -441,7 +441,7 @@ public:
virtual AbstractSwBreakDlg * CreateSwBreakDlg ( Window *pParent, SwWrtShell &rSh,int nResId ); // add for SwBreakDlg
virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ); //add for SwChangeDBDlg
virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg
- const String* pFmtStr = 0, BOOL bIsDrwTxtDlg = FALSE);
+ const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False);
virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg ( SwView& rView, int nResId, bool bToTable ); //add for SwConvertTableDlg
virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId); //add for SwCaptionDialog
@@ -452,20 +452,20 @@ public:
virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg( Window *pParent, SwWrtShell &rSh,int nResId);//add for SwFootNoteOptionDlg
virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog ( Window *pParent, SwWrtShell &rSh, //add for DropDownFieldDialog
- SwField* pField,int nResId, BOOL bNextButton = FALSE );
- virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert,int nResId ); //add for SwEnvDlg
+ SwField* pField,int nResId, sal_Bool bNextButton = sal_False );
+ virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert,int nResId ); //add for SwEnvDlg
virtual AbstractSwLabDlg* CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
- SwNewDBMgr* pNewDBMgr, BOOL bLabel,int nResId );
+ SwNewDBMgr* pNewDBMgr, sal_Bool bLabel,int nResId );
virtual SwLabDlgMethod GetSwLabDlgStaticMethod (); //add for SwLabDlg
virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, //add for SwParaDlg
SwView& rVw,
const SfxItemSet& rCoreSet,
- BYTE nDialogMode,
+ sal_uInt8 nDialogMode,
int nResId,
const String *pCollName = 0,
- BOOL bDraw = FALSE,
- UINT16 nDefPage = 0);
+ sal_Bool bDraw = sal_False,
+ sal_uInt16 nDefPage = 0);
virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ); //add for SwSelGlossaryDlg
virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); //add for SwTableHeightDlg SwSortDlg
@@ -473,11 +473,11 @@ public:
virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
int nResId,
- BOOL bSetAutoFmt = TRUE,
+ sal_Bool bSetAutoFmt = sal_True,
const SwTableAutoFmt* pSelFmt = 0 );
- virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, USHORT nType,int nResId );//add for SwBorderDlg
+ virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType,int nResId );//add for SwBorderDlg
- virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ); //add for SwWrapDlg
+ virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ); //add for SwWrapDlg
virtual VclAbstractDialog * CreateSwTableWidthDlg ( Window *pParent, SwTableFUNC &rFnc , int nResId ); //add for SwTableWidthDlg
virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ); //add for SwTableTabDlg
@@ -489,34 +489,34 @@ public:
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ); //add for SwModalRedlineAcceptDlg
virtual VclAbstractDialog* CreateSwVclDialog( int nResId,
- Window* pParent, BOOL& rWithPrev ); //add for SwMergeTblDlg
+ Window* pParent, sal_Bool& rWithPrev ); //add for SwMergeTblDlg
virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
- BOOL bNewFrm = TRUE,
- USHORT nResType = DLG_FRM_STD,
- BOOL bFmt = FALSE,
- UINT16 nDefPage = 0,
+ sal_Bool bNewFrm = sal_True,
+ sal_uInt16 nResType = DLG_FRM_STD,
+ sal_Bool bFmt = sal_False,
+ sal_uInt16 nDefPage = 0,
const String* pFmtStr = 0); //add for SwFrmDlg
virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
Window* pParent,
SfxStyleSheetBase& rBase,
- USHORT nRegion,
- BOOL bColumn = FALSE,
+ sal_uInt16 nRegion,
+ sal_Bool bColumn = sal_False,
SwWrtShell* pActShell = 0,
- BOOL bNew = FALSE ); //add for SwTemplateDlg
+ sal_Bool bNew = sal_False ); //add for SwTemplateDlg
virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell); //add for SwGlossaryDlg
virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId,
Window *pParent, SwWrtShell &rSh,
- SwField* pField, BOOL bNextButton = FALSE ); //add for SwFldInputDlg
+ SwField* pField, sal_Bool bNextButton = sal_False ); //add for SwFldInputDlg
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
- Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); //add for SwInsFootNoteDlg
+ Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False); //add for SwInsFootNoteDlg
virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
- SwView& rView, BOOL bCol = FALSE ); //add for SwInsRowColDlg, SwLineNumberingDlg
+ SwView& rView, sal_Bool bCol = sal_False ); //add for SwInsRowColDlg, SwLineNumberingDlg
virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
Window * pParent ); //add for SwInsertGrfRulerDlg
virtual AbstractInsTableDlg* CreateInsTableDlg( int nResId,
@@ -543,8 +543,8 @@ public:
virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId,
Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
- SwTOXBase* pCurTOX, USHORT nToxType = USHRT_MAX,
- BOOL bGlobal = FALSE); //add for SwMultiTOXTabDialog
+ SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX,
+ sal_Bool bGlobal = sal_False); //add for SwMultiTOXTabDialog
virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId,
Window* pParent, SwWrtShell& rWrtSh ); //add for SwEditRegionDlg
virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId,
@@ -567,13 +567,13 @@ public:
virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem);
//add for static func in SwGlossaryDlg
- virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( USHORT nId );
- virtual GlossarySetActGroup SetGlossaryActGroupFunc( USHORT nId );
+ virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( sal_uInt16 nId );
+ virtual GlossarySetActGroup SetGlossaryActGroupFunc( sal_uInt16 nId );
// For TabPage
- virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId );
+ virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId );
- virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId );
+ virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId );
};
@@ -584,5 +584,4 @@ struct SwDialogsResMgr
#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/sw/source/ui/dialog/swwrtshitem.cxx b/sw/source/ui/dialog/swwrtshitem.cxx
index 6975975c3c..6bfcd3d8da 100644
--- a/sw/source/ui/dialog/swwrtshitem.cxx
+++ b/sw/source/ui/dialog/swwrtshitem.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
#include "swwrtshitem.hxx"
TYPEINIT1(SwWrtShellItem,SfxPoolItem);
-SwWrtShellItem::SwWrtShellItem( USHORT _nWhich, SwWrtShell* pSh )
+SwWrtShellItem::SwWrtShellItem( sal_uInt16 _nWhich, SwWrtShell* pSh )
: SfxPoolItem( _nWhich ), pWrtSh( pSh )
{
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 582b5fb390..85c2c4901c 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -94,8 +94,8 @@ void lcl_FillList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames
const SwSectionFmt* pFmt;
if( !pNewFmt )
{
- USHORT nCount = rSh.GetSectionFmtCount();
- for(USHORT i=0;i<nCount;i++)
+ sal_uInt16 nCount = rSh.GetSectionFmtCount();
+ for(sal_uInt16 i=0;i<nCount;i++)
{
SectionType eTmpType;
if( !(pFmt = &rSh.GetSectionFmt(i))->GetParent() &&
@@ -115,11 +115,11 @@ void lcl_FillList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames
else
{
SwSections aTmpArr;
- USHORT nCnt = pNewFmt->GetChildSections(aTmpArr,SORTSECT_POS);
+ sal_uInt16 nCnt = pNewFmt->GetChildSections(aTmpArr,SORTSECT_POS);
if( nCnt )
{
SectionType eTmpType;
- for( USHORT n = 0; n < nCnt; ++n )
+ for( sal_uInt16 n = 0; n < nCnt; ++n )
if( (pFmt = aTmpArr[n]->GetFmt())->IsInNodesArr()&&
(eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
&& TOX_HEADER_SECTION != eTmpType )
@@ -174,7 +174,7 @@ private:
SwFmtNoBalancedColumns m_Balance;
SvxFrameDirectionItem m_FrmDirItem;
SvxLRSpaceItem m_LRSpaceItem;
- USHORT m_nArrPos;
+ sal_uInt16 m_nArrPos;
// shows, if maybe textcontent is in the region
bool m_bContent : 1;
// for multiselection, mark at first, then work with TreeListBox!
@@ -182,7 +182,7 @@ private:
uno::Sequence<sal_Int8> m_TempPasswd;
public:
- SectRepr(USHORT nPos, SwSection& rSect);
+ SectRepr(sal_uInt16 nPos, SwSection& rSect);
bool operator==(SectRepr& rSectRef) const
{ return m_nArrPos == rSectRef.GetArrPos(); }
@@ -199,7 +199,7 @@ public:
SvxFrameDirectionItem& GetFrmDir() { return m_FrmDirItem; }
SvxLRSpaceItem& GetLRSpace() { return m_LRSpaceItem; }
- USHORT GetArrPos() const { return m_nArrPos; }
+ sal_uInt16 GetArrPos() const { return m_nArrPos; }
String GetFile() const;
String GetSubRegion() const;
void SetFile(String const& rFile);
@@ -220,7 +220,7 @@ public:
SV_IMPL_OP_PTRARR_SORT( SectReprArr, SectReprPtr )
-SectRepr::SectRepr( USHORT nPos, SwSection& rSect )
+SectRepr::SectRepr( sal_uInt16 nPos, SwSection& rSect )
: m_SectionData( rSect )
, m_Brush( RES_BACKGROUND )
, m_FrmDirItem( FRMDIR_ENVIRONMENT, RES_FRAMEDIR )
@@ -325,7 +325,7 @@ String SectRepr::GetFile() const
{
if (DDE_LINK_SECTION == m_SectionData.GetType())
{
- USHORT n = sLinkFile.SearchAndReplace( sfx2::cTokenSeperator, ' ' );
+ sal_uInt16 n = sLinkFile.SearchAndReplace( sfx2::cTokenSeperator, ' ' );
sLinkFile.SearchAndReplace( sfx2::cTokenSeperator, ' ', n );
}
else
@@ -422,7 +422,7 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
aTree.SetHelpId(HID_REGION_TREE);
aTree.SetSelectionMode( MULTIPLE_SELECTION );
- aTree.SetWindowBits(WB_HASBUTTONSATROOT|WB_CLIPCHILDREN|WB_HSCROLL);
+ aTree.SetStyle(aTree.GetStyle()|WB_HASBUTTONSATROOT|WB_CLIPCHILDREN|WB_HSCROLL);
aTree.SetSpaceBetweenEntries(0);
if(bWeb)
@@ -446,13 +446,17 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
aTree.Select( aTree.First() );
aTree.Show();
bDontCheckPasswd = sal_False;
+
+ aPasswdPB.SetAccessibleRelationMemberOf(&aProtectFL);
+ aPasswdPB.SetAccessibleRelationLabeledBy(&aPasswdCB);
+ aSubRegionED.SetAccessibleName(aSubRegionFT.GetText());
}
-BOOL SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
+sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
{
if(bDontCheckPasswd)
- return TRUE;
- sal_Bool bRet = TRUE;
+ return sal_True;
+ sal_Bool bRet = sal_True;
SvLBoxEntry* pEntry = aTree.FirstSelected();
while( pEntry )
{
@@ -461,7 +465,7 @@ BOOL SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
&& pRepr->GetSectionData().GetPassword().getLength())
{
SwTestPasswdDlg aPasswdDlg(this);
- bRet = FALSE;
+ bRet = sal_False;
if (aPasswdDlg.Execute())
{
String sNewPasswd( aPasswdDlg.GetPassword() );
@@ -471,7 +475,7 @@ BOOL SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
pRepr->GetSectionData().GetPassword(), sNewPasswd))
{
pRepr->SetTempPasswd(aNewPasswd);
- bRet = TRUE;
+ bRet = sal_True;
}
else
{
@@ -503,8 +507,8 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
if (!pFmt)
{
- USHORT nCount=rSh.GetSectionFmtCount();
- for ( USHORT n=0; n < nCount; n++ )
+ sal_uInt16 nCount=rSh.GetSectionFmtCount();
+ for ( sal_uInt16 n=0; n < nCount; n++ )
{
SectionType eTmpType;
if( !( pFmt = &rSh.GetSectionFmt(n))->GetParent() &&
@@ -529,10 +533,10 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
{
SwSections aTmpArr;
SvLBoxEntry* pNEntry;
- USHORT nCnt = pFmt->GetChildSections(aTmpArr,SORTSECT_POS);
+ sal_uInt16 nCnt = pFmt->GetChildSections(aTmpArr,SORTSECT_POS);
if( nCnt )
{
- for( USHORT n = 0; n < nCnt; ++n )
+ for( sal_uInt16 n = 0; n < nCnt; ++n )
{
SectionType eTmpType;
pFmt = aTmpArr[n]->GetFmt();
@@ -564,10 +568,10 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
}
}
-USHORT SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt )
+sal_uInt16 SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt )
{
- USHORT nCount=rSh.GetSectionFmtCount();
- for (USHORT i=0;i<nCount;i++)
+ sal_uInt16 nCount=rSh.GetSectionFmtCount();
+ for (sal_uInt16 i=0;i<nCount;i++)
if (pFmt==&rSh.GetSectionFmt(i))
return i;
@@ -600,7 +604,7 @@ void SwEditRegionDlg::SelectSection(const String& rSectionName)
}
if(pEntry)
{
- aTree.SelectAll( FALSE);
+ aTree.SelectAll( sal_False);
aTree.Select(pEntry);
aTree.MakeVisible(pEntry);
}
@@ -615,21 +619,21 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
{
bDontCheckPasswd = sal_True;
SvLBoxEntry* pEntry=pBox->FirstSelected();
- aHideCB .Enable(TRUE);
+ aHideCB .Enable(sal_True);
// edit in readonly sections
- aEditInReadonlyCB.Enable(TRUE);
+ aEditInReadonlyCB.Enable(sal_True);
- aProtectCB .Enable(TRUE);
- aFileCB .Enable(TRUE);
+ aProtectCB .Enable(sal_True);
+ aFileCB .Enable(sal_True);
UNO_NMSPC::Sequence <sal_Int8> aCurPasswd;
if( 1 < pBox->GetSelectionCount() )
{
- aHideCB.EnableTriState( TRUE );
- aProtectCB.EnableTriState( TRUE );
+ aHideCB.EnableTriState( sal_True );
+ aProtectCB.EnableTriState( sal_True );
// edit in readonly sections
- aEditInReadonlyCB.EnableTriState ( TRUE );
+ aEditInReadonlyCB.EnableTriState ( sal_True );
- aFileCB.EnableTriState( TRUE );
+ aFileCB.EnableTriState( sal_True );
bool bHiddenValid = true;
bool bProtectValid = true;
@@ -641,10 +645,10 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
bool bHidden = true;
bool bProtect = true;
String sCondition;
- BOOL bFirst = TRUE;
- BOOL bFileValid = TRUE;
- BOOL bFile = TRUE;
- BOOL bPasswdValid = TRUE;
+ sal_Bool bFirst = sal_True;
+ sal_Bool bFileValid = sal_True;
+ sal_Bool bFile = sal_True;
+ sal_Bool bPasswdValid = sal_True;
while( pEntry )
{
@@ -665,7 +669,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
{
String sTemp(rData.GetCondition());
if(sCondition != sTemp)
- bConditionValid = FALSE;
+ bConditionValid = sal_False;
bHiddenValid = (bHidden == rData.IsHidden());
bProtectValid = (bProtect == rData.IsProtectFlag());
// edit in readonly sections
@@ -677,7 +681,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
bPasswdValid = (aCurPasswd == rData.GetPassword());
}
pEntry = pBox->NextSelected(pEntry);
- bFirst = FALSE;
+ bFirst = sal_False;
}
aHideCB.SetState( !bHiddenValid ? STATE_DONTKNOW :
@@ -695,26 +699,26 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
aConditionED.SetText(sCondition);
else
{
- aConditionFT.Enable(FALSE);
- aConditionED.Enable(FALSE);
+ aConditionFT.Enable(sal_False);
+ aConditionED.Enable(sal_False);
}
- aFilePB.Enable(FALSE);
- aFileNameFT .Enable(FALSE);
- aFileNameED .Enable(FALSE);
- aSubRegionFT.Enable(FALSE);
- aSubRegionED.Enable(FALSE);
- aCurName .Enable(FALSE);
- aOptionsPB .Enable(FALSE);
- aDDECB .Enable(FALSE);
- aDDECommandFT .Enable(FALSE);
- BOOL bPasswdEnabled = aProtectCB.GetState() == STATE_CHECK;
+ aFilePB.Enable(sal_False);
+ aFileNameFT .Enable(sal_False);
+ aFileNameED .Enable(sal_False);
+ aSubRegionFT.Enable(sal_False);
+ aSubRegionED.Enable(sal_False);
+ aCurName .Enable(sal_False);
+ aOptionsPB .Enable(sal_False);
+ aDDECB .Enable(sal_False);
+ aDDECommandFT .Enable(sal_False);
+ sal_Bool bPasswdEnabled = aProtectCB.GetState() == STATE_CHECK;
aPasswdCB.Enable(bPasswdEnabled);
aPasswdPB.Enable(bPasswdEnabled);
if(!bPasswdValid)
{
pEntry = pBox->FirstSelected();
- pBox->SelectAll( FALSE );
+ pBox->SelectAll( sal_False );
pBox->Select( pEntry );
GetFirstEntryHdl(pBox);
return 0;
@@ -724,14 +728,14 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
}
else if (pEntry )
{
- aCurName .Enable(TRUE);
- aOptionsPB .Enable(TRUE);
+ aCurName .Enable(sal_True);
+ aOptionsPB .Enable(sal_True);
SectRepr* pRepr=(SectRepr*) pEntry->GetUserData();
SwSectionData const& rData( pRepr->GetSectionData() );
aConditionED.SetText(rData.GetCondition());
aHideCB.Enable();
aHideCB.SetState((rData.IsHidden()) ? STATE_CHECK : STATE_NOCHECK);
- BOOL bHide = STATE_CHECK == aHideCB.GetState();
+ sal_Bool bHide = STATE_CHECK == aHideCB.GetState();
aConditionED.Enable(bHide);
aConditionFT.Enable(bHide);
aPasswdCB.Check(rData.GetPassword().getLength() > 0);
@@ -747,17 +751,17 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
aSubRegionED.Clear();
if(aFile.Len()||sSub.Len())
{
- aFileCB.Check(TRUE);
+ aFileCB.Check(sal_True);
aFileNameED.SetText(aFile);
aSubRegionED.SetText(sSub);
aDDECB.Check(rData.GetType() == DDE_LINK_SECTION);
}
else
{
- aFileCB.Check(FALSE);
+ aFileCB.Check(sal_False);
aFileNameED.SetText(aFile);
- aDDECB.Enable(FALSE);
- aDDECB.Check(FALSE);
+ aDDECB.Enable(sal_False);
+ aDDECB.Check(sal_False);
}
UseFileHdl(&aFileCB);
DDEHdl( &aDDECB );
@@ -770,7 +774,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
? STATE_CHECK : STATE_NOCHECK);
aEditInReadonlyCB.Enable();
- BOOL bPasswdEnabled = aProtectCB.IsChecked();
+ sal_Bool bPasswdEnabled = aProtectCB.IsChecked();
aPasswdCB.Enable(bPasswdEnabled);
aPasswdPB.Enable(bPasswdEnabled);
}
@@ -782,24 +786,24 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
{
if( !pBox->GetSelectionCount() )
{
- aHideCB .Enable(FALSE);
- aProtectCB .Enable(FALSE);
+ aHideCB .Enable(sal_False);
+ aProtectCB .Enable(sal_False);
// edit in readonly sections
- aEditInReadonlyCB.Enable(FALSE);
-
- aPasswdCB .Enable(FALSE);
- aPasswdCB .Enable(FALSE);
- aConditionFT .Enable(FALSE);
- aConditionED.Enable(FALSE);
- aFileCB .Enable(FALSE);
- aFilePB .Enable(FALSE);
- aFileNameFT .Enable(FALSE);
- aFileNameED .Enable(FALSE);
- aSubRegionFT .Enable(FALSE);
- aSubRegionED .Enable(FALSE);
- aCurName .Enable(FALSE);
- aDDECB .Enable(FALSE);
- aDDECommandFT .Enable(FALSE);
+ aEditInReadonlyCB.Enable(sal_False);
+
+ aPasswdCB .Enable(sal_False);
+ aPasswdCB .Enable(sal_False);
+ aConditionFT .Enable(sal_False);
+ aConditionED.Enable(sal_False);
+ aFileCB .Enable(sal_False);
+ aFilePB .Enable(sal_False);
+ aFileNameFT .Enable(sal_False);
+ aFileNameED .Enable(sal_False);
+ aSubRegionFT .Enable(sal_False);
+ aSubRegionED .Enable(sal_False);
+ aCurName .Enable(sal_False);
+ aDDECB .Enable(sal_False);
+ aDDECommandFT .Enable(sal_False);
UseFileHdl(&aFileCB);
DDEHdl( &aDDECB );
@@ -826,7 +830,7 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
rSh.StartAllAction();
rSh.StartUndo();
- rSh.ResetSelect( 0,FALSE );
+ rSh.ResetSelect( 0,sal_False );
SvLBoxEntry* pEntry = aTree.First();
while( pEntry )
@@ -837,20 +841,20 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
{
pRepr->GetSectionData().SetPassword(uno::Sequence<sal_Int8 >());
}
- USHORT nNewPos = rDocFmts.GetPos( pFmt );
+ sal_uInt16 nNewPos = rDocFmts.GetPos( pFmt );
if( USHRT_MAX != nNewPos )
{
- SfxItemSet* pSet = pFmt->GetAttrSet().Clone( FALSE );
+ SfxItemSet* pSet = pFmt->GetAttrSet().Clone( sal_False );
if( pFmt->GetCol() != pRepr->GetCol() )
pSet->Put( pRepr->GetCol() );
- if( pFmt->GetBackground(FALSE) != pRepr->GetBackground() )
+ if( pFmt->GetBackground(sal_False) != pRepr->GetBackground() )
pSet->Put( pRepr->GetBackground() );
- if( pFmt->GetFtnAtTxtEnd(FALSE) != pRepr->GetFtnNtAtEnd() )
+ if( pFmt->GetFtnAtTxtEnd(sal_False) != pRepr->GetFtnNtAtEnd() )
pSet->Put( pRepr->GetFtnNtAtEnd() );
- if( pFmt->GetEndAtTxtEnd(FALSE) != pRepr->GetEndNtAtEnd() )
+ if( pFmt->GetEndAtTxtEnd(sal_False) != pRepr->GetEndNtAtEnd() )
pSet->Put( pRepr->GetEndNtAtEnd() );
if( pFmt->GetBalancedColumns() != pRepr->GetBalance() )
@@ -869,10 +873,10 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
pEntry = aTree.Next( pEntry );
}
- for(USHORT i = aSectReprArr.Count(); i; )
+ for(sal_uInt16 i = aSectReprArr.Count(); i; )
{
SwSectionFmt* pFmt = aOrigArray[ aSectReprArr[ --i ]->GetArrPos() ];
- USHORT nNewPos = rDocFmts.GetPos( pFmt );
+ sal_uInt16 nNewPos = rDocFmts.GetPos( pFmt );
if( USHRT_MAX != nNewPos )
rSh.DelSectionFmt( nNewPos );
}
@@ -896,10 +900,10 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox )
{
if(!CheckPasswd(pBox))
return 0;
- pBox->EnableTriState( FALSE );
+ pBox->EnableTriState( sal_False );
SvLBoxEntry* pEntry=aTree.FirstSelected();
OSL_ENSURE(pEntry,"no entry found");
- BOOL bCheck = STATE_CHECK == pBox->GetState();
+ sal_Bool bCheck = STATE_CHECK == pBox->GetState();
while( pEntry )
{
SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData();
@@ -922,7 +926,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox )
{
if(!CheckPasswd(pBox))
return 0;
- pBox->EnableTriState( FALSE );
+ pBox->EnableTriState( sal_False );
SvLBoxEntry* pEntry=aTree.FirstSelected();
OSL_ENSURE(pEntry,"no entry found");
while( pEntry )
@@ -938,7 +942,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox )
pEntry = aTree.NextSelected(pEntry);
}
- BOOL bHide = STATE_CHECK == pBox->GetState();
+ sal_Bool bHide = STATE_CHECK == pBox->GetState();
aConditionED.Enable(bHide);
aConditionFT.Enable(bHide);
return 0;
@@ -951,7 +955,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox )
{
if(!CheckPasswd(pBox))
return 0;
- pBox->EnableTriState( FALSE );
+ pBox->EnableTriState( sal_False );
SvLBoxEntry* pEntry=aTree.FirstSelected();
OSL_ENSURE(pEntry,"no entry found");
while( pEntry )
@@ -988,14 +992,14 @@ IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG )
{
const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData();
SvLBoxEntry* pRemove = 0;
- BOOL bRestart = FALSE;
+ sal_Bool bRestart = sal_False;
if(pSectRepr->IsSelected())
{
aSectReprArr.Insert( pSectRepr );
while( (pChild = aTree.FirstChild(pEntry) )!= 0 )
{
// because of the repositioning we have to start at the beginning again
- bRestart = TRUE;
+ bRestart = sal_True;
pParent=aTree.GetParent(pEntry);
aTree.GetModel()->Move(pChild, pParent, aTree.GetModel()->GetRelPos(pEntry));
}
@@ -1011,20 +1015,20 @@ IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG )
if ( (pEntry=aTree.FirstSelected()) == 0 )
{
- aConditionFT. Enable(FALSE);
- aConditionED. Enable(FALSE);
- aDismiss. Enable(FALSE);
- aCurName. Enable(FALSE);
- aProtectCB. Enable(FALSE);
- aPasswdCB. Enable(FALSE);
- aHideCB. Enable(FALSE);
+ aConditionFT. Enable(sal_False);
+ aConditionED. Enable(sal_False);
+ aDismiss. Enable(sal_False);
+ aCurName. Enable(sal_False);
+ aProtectCB. Enable(sal_False);
+ aPasswdCB. Enable(sal_False);
+ aHideCB. Enable(sal_False);
// edit in readonly sections
- aEditInReadonlyCB.Enable(FALSE);
+ aEditInReadonlyCB.Enable(sal_False);
aEditInReadonlyCB.SetState(STATE_NOCHECK);
aProtectCB. SetState(STATE_NOCHECK);
- aPasswdCB. Check(FALSE);
+ aPasswdCB. Check(sal_False);
aHideCB. SetState(STATE_NOCHECK);
- aFileCB. Check(FALSE);
+ aFileCB. Check(sal_False);
// otherwise the focus would be on HelpButton
aOK.GrabFocus();
UseFileHdl(&aFileCB);
@@ -1040,22 +1044,22 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
if(!CheckPasswd(pBox))
return 0;
SvLBoxEntry* pEntry = aTree.FirstSelected();
- pBox->EnableTriState(FALSE);
- BOOL bMulti = 1 < aTree.GetSelectionCount();
- BOOL bFile = pBox->IsChecked();
+ pBox->EnableTriState(sal_False);
+ sal_Bool bMulti = 1 < aTree.GetSelectionCount();
+ sal_Bool bFile = pBox->IsChecked();
if(pEntry)
{
while(pEntry)
{
const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData();
- BOOL bContent = pSectRepr->IsContent();
+ sal_Bool bContent = pSectRepr->IsContent();
if( pBox->IsChecked() && bContent && rSh.HasSelection() )
{
if( RET_NO == QueryBox( this, SW_RES(QB_CONNECT) ).Execute() )
- pBox->Check( FALSE );
+ pBox->Check( sal_False );
}
if( bFile )
- pSectRepr->SetContent(FALSE);
+ pSectRepr->SetContent(sal_False);
else
{
pSectRepr->SetFile(aEmptyStr);
@@ -1080,23 +1084,23 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
}
else
{
- aDDECB.Check(FALSE);
+ aDDECB.Check(sal_False);
DDEHdl(&aDDECB);
aSubRegionED.SetText(aEmptyStr);
}
}
else
{
- pBox->Check(FALSE);
- pBox->Enable(FALSE);
- aFilePB.Enable(FALSE);
- aFileNameED.Enable(FALSE);
- aFileNameFT.Enable(FALSE);
- aSubRegionED.Enable(FALSE);
- aSubRegionFT.Enable(FALSE);
- aDDECB.Check(FALSE);
- aDDECB.Enable(FALSE);
- aDDECommandFT.Enable(FALSE);
+ pBox->Check(sal_False);
+ pBox->Enable(sal_False);
+ aFilePB.Enable(sal_False);
+ aFileNameED.Enable(sal_False);
+ aFileNameFT.Enable(sal_False);
+ aSubRegionED.Enable(sal_False);
+ aSubRegionFT.Enable(sal_False);
+ aDDECB.Check(sal_False);
+ aDDECB.Enable(sal_False);
+ aDDECommandFT.Enable(sal_False);
}
return 0;
}
@@ -1168,19 +1172,19 @@ IMPL_LINK( SwEditRegionDlg, OptionsHdl, PushButton *, EMPTYARG )
*pFtnItem, *pEndItem, *pBalanceItem,
*pFrmDirItem, *pLRSpaceItem;
SfxItemState eColState = pOutSet->GetItemState(
- RES_COL, FALSE, &pColItem );
+ RES_COL, sal_False, &pColItem );
SfxItemState eBrushState = pOutSet->GetItemState(
- RES_BACKGROUND, FALSE, &pBrushItem );
+ RES_BACKGROUND, sal_False, &pBrushItem );
SfxItemState eFtnState = pOutSet->GetItemState(
- RES_FTN_AT_TXTEND, FALSE, &pFtnItem );
+ RES_FTN_AT_TXTEND, sal_False, &pFtnItem );
SfxItemState eEndState = pOutSet->GetItemState(
- RES_END_AT_TXTEND, FALSE, &pEndItem );
+ RES_END_AT_TXTEND, sal_False, &pEndItem );
SfxItemState eBalanceState = pOutSet->GetItemState(
- RES_COLUMNBALANCE, FALSE, &pBalanceItem );
+ RES_COLUMNBALANCE, sal_False, &pBalanceItem );
SfxItemState eFrmDirState = pOutSet->GetItemState(
- RES_FRAMEDIR, FALSE, &pFrmDirItem );
+ RES_FRAMEDIR, sal_False, &pFrmDirItem );
SfxItemState eLRState = pOutSet->GetItemState(
- RES_LR_SPACE, FALSE, &pLRSpaceItem);
+ RES_LR_SPACE, sal_False, &pLRSpaceItem);
if( SFX_ITEM_SET == eColState ||
SFX_ITEM_SET == eBrushState ||
@@ -1239,7 +1243,7 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit )
if( aDDECB.IsChecked() )
{
String sLink( pEdit->GetText() );
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
while( STRING_NOTFOUND != (nPos = sLink.SearchAscii( " ", nPos )) )
sLink.Erase( nPos--, 1 );
@@ -1279,10 +1283,10 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox )
SvLBoxEntry* pEntry=aTree.FirstSelected();
if(pEntry)
{
- BOOL bFile = aFileCB.IsChecked();
+ sal_Bool bFile = aFileCB.IsChecked();
SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData();
SwSectionData & rData( pSectRepr->GetSectionData() );
- BOOL bDDE = pBox->IsChecked();
+ sal_Bool bDDE = pBox->IsChecked();
if(bDDE)
{
aFileNameFT.Hide();
@@ -1297,6 +1301,7 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox )
rData.SetLinkFilePassword( aEmptyStr );
}
rData.SetType(DDE_LINK_SECTION);
+ aFileNameED.SetAccessibleName(aDDECommandFT.GetText());
}
else
{
@@ -1315,6 +1320,7 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox )
rData.SetLinkFilePassword( aEmptyStr );
aFileNameED.SetText(aEmptyStr);
}
+ aFileNameED.SetAccessibleName(aFileNameFT.GetText());
}
aFilePB.Enable(bFile && !bDDE);
}
@@ -1359,7 +1365,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
else
{
if(!bChange)
- aPasswdCB.Check(FALSE);
+ aPasswdCB.Check(sal_False);
break;
}
}
@@ -1425,7 +1431,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg )
sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
sFilterName = pMedium->GetFilter()->GetFilterName();
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, FALSE, &pItem ) )
+ if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, sal_False, &pItem ) )
sPassword = ( (SfxStringItem*)pItem )->GetValue();
::lcl_ReadSections( *pMedium, aSubRegionED );
delete pMedium;
@@ -1475,7 +1481,7 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent )
return 0;
}
-Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden)
+Image SwEditRegionDlg::BuildBitmap( sal_Bool bProtect, sal_Bool bHidden )
{
ImageList& rImgLst = aImageIL;
return rImgLst.GetImage((!bHidden+(bProtect<<1)) + 1);
@@ -1496,7 +1502,7 @@ static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox )
nFormat == SOT_FORMATSTR_ID_STARWRITER_8 || nFormat == SOT_FORMATSTR_ID_STARWRITERGLOB_8)
SwGetReaderXML()->GetSectionList( rMedium, aArr );
- for( USHORT n = 0; n < aArr.Count(); ++n )
+ for( sal_uInt16 n = 0; n < aArr.Count(); ++n )
rBox.InsertEntry( *aArr[ n ] );
aArr.DeleteAndDestroy(0, aArr.Count());
@@ -1523,7 +1529,7 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog(
SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get();
long nHtmlMode = pHtmlOpt->GetExportMode();
- BOOL bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() );
+ sal_Bool bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() );
if(bWeb)
{
RemoveTabPage(TP_SECTION_FTNENDNOTES);
@@ -1538,7 +1544,7 @@ SwInsertSectionTabDialog::~SwInsertSectionTabDialog()
{
}
-void SwInsertSectionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
+void SwInsertSectionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
if(TP_INSERT_SECTION == nId)
((SwInsertSectionTabPage&)rPage).SetWrtShell(rWrtSh);
@@ -1552,8 +1558,8 @@ void SwInsertSectionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
{
const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)GetInputSetImpl()->Get(RES_FRM_SIZE);
((SwColumnPage&)rPage).SetPageWidth(rSize.GetWidth());
- ((SwColumnPage&)rPage).ShowBalance(TRUE);
- ((SwColumnPage&)rPage).SetInSection(TRUE);
+ ((SwColumnPage&)rPage).ShowBalance(sal_True);
+ ((SwColumnPage&)rPage).SetInSection(sal_True);
}
else if(TP_SECTION_INDENTS == nId)
((SwSectionIndentTabPage&)rPage).SetWrtShell(rWrtSh);
@@ -1578,7 +1584,7 @@ short SwInsertSectionTabDialog::Ok()
{
SfxRequest aRequest( pViewFrm, FN_INSERT_REGION);
const SfxPoolItem* pCol;
- if(SFX_ITEM_SET == pOutputItemSet->GetItemState(RES_COL, FALSE, &pCol))
+ if(SFX_ITEM_SET == pOutputItemSet->GetItemState(RES_COL, sal_False, &pCol))
{
aRequest.AppendItem(SfxUInt16Item(SID_ATTR_COLUMNS,
((const SwFmtCol*)pCol)->GetColumns().Count()));
@@ -1649,6 +1655,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage(
aCurName.SetModifyHdl ( LINK( this, SwInsertSectionTabPage, NameEditHdl));
aDDECB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, DDEHdl ));
ChangeProtectHdl(&aProtectCB);
+ aPasswdPB.SetAccessibleRelationMemberOf(&aProtectFL);
aSubRegionED.EnableAutocomplete( sal_True, sal_True );
}
@@ -1661,7 +1668,7 @@ void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
{
m_pWrtSh = &rSh;
- BOOL bWeb = 0 != PTR_CAST(SwWebDocShell, m_pWrtSh->GetView().GetDocShell());
+ sal_Bool bWeb = 0 != PTR_CAST(SwWebDocShell, m_pWrtSh->GetView().GetDocShell());
if(bWeb)
{
aHideCB .Hide();
@@ -1693,11 +1700,11 @@ void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
}
}
-BOOL SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
+sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
{
SwSectionData aSection(CONTENT_SECTION, aCurName.GetText());
aSection.SetCondition(aConditionED.GetText());
- BOOL bProtected = aProtectCB.IsChecked();
+ sal_Bool bProtected = aProtectCB.IsChecked();
aSection.SetProtectFlag(bProtected);
aSection.SetHidden(aHideCB.IsChecked());
// edit in readonly sections
@@ -1709,7 +1716,7 @@ BOOL SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
}
String sFileName = aFileNameED.GetText();
String sSubRegion = aSubRegionED.GetText();
- BOOL bDDe = aDDECB.IsChecked();
+ sal_Bool bDDe = aDDECB.IsChecked();
if(aFileCB.IsChecked() && (sFileName.Len() || sSubRegion.Len() || bDDe))
{
String aLinkFile;
@@ -1717,7 +1724,7 @@ BOOL SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
{
aLinkFile = sFileName;
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
while( STRING_NOTFOUND != (nPos = aLinkFile.SearchAscii( " ", nPos )) )
aLinkFile.Erase( nPos--, 1 );
@@ -1752,7 +1759,7 @@ BOOL SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
}
}
((SwInsertSectionTabDialog*)GetTabDialog())->SetSectionData(aSection);
- return TRUE;
+ return sal_True;
}
void SwInsertSectionTabPage::Reset( const SfxItemSet& )
@@ -1767,7 +1774,7 @@ SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent,
IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox )
{
- BOOL bHide = pBox->IsChecked();
+ sal_Bool bHide = pBox->IsChecked();
aConditionED.Enable(bHide);
aConditionFT.Enable(bHide);
return 0;
@@ -1809,7 +1816,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
}
}
else if(!bChange)
- aPasswdCB.Check(FALSE);
+ aPasswdCB.Check(sal_False);
}
}
else
@@ -1831,10 +1838,10 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
{
if( m_pWrtSh->HasSelection() &&
RET_NO == QueryBox( this, SW_RES(QB_CONNECT) ).Execute() )
- pBox->Check( FALSE );
+ pBox->Check( sal_False );
}
- BOOL bFile = pBox->IsChecked();
+ sal_Bool bFile = pBox->IsChecked();
aFileNameFT.Enable(bFile);
aFileNameED.Enable(bFile);
aFilePB.Enable(bFile);
@@ -1845,11 +1852,11 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
if( bFile )
{
aFileNameED.GrabFocus();
- aProtectCB.Check( TRUE );
+ aProtectCB.Check( sal_True );
}
else
{
- aDDECB.Check(FALSE);
+ aDDECB.Check(sal_False);
DDEHdl(&aDDECB);
}
return 0;
@@ -1868,8 +1875,8 @@ IMPL_LINK( SwInsertSectionTabPage, FileSearchHdl, PushButton *, EMPTYARG )
IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox )
{
- BOOL bDDE = pBox->IsChecked();
- BOOL bFile = aFileCB.IsChecked();
+ sal_Bool bDDE = pBox->IsChecked();
+ sal_Bool bFile = aFileCB.IsChecked();
aFilePB.Enable(!bDDE && bFile);
if(bDDE)
{
@@ -1878,6 +1885,7 @@ IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox )
aDDECommandFT.Show();
aSubRegionFT.Hide();
aSubRegionED.Hide();
+ aFileNameED.SetAccessibleName(aDDECommandFT.GetText());
}
else
{
@@ -1887,6 +1895,7 @@ IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox )
aSubRegionFT.Show();
aSubRegionED.Show();
aSubRegionED.Enable(bFile);
+ aFileNameED.SetAccessibleName(aFileNameFT.GetText());
}
return 0;
}
@@ -1901,7 +1910,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
m_sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
m_sFilterName = pMedium->GetFilter()->GetFilterName();
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, FALSE, &pItem ) )
+ if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, sal_False, &pItem ) )
m_sFilePasswd = ( (SfxStringItem*)pItem )->GetValue();
aFileNameED.SetText( INetURLObject::decode(
m_sFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ) );
@@ -1928,12 +1937,12 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
// 5 - A, .., AA, .., - 9
// 6 - a, .., aa, .., - 10
-inline USHORT GetNumPos( USHORT n )
+inline sal_uInt16 GetNumPos( sal_uInt16 n )
{
return SVX_NUM_ARABIC < n ? n - 4 : n;
}
-inline SvxExtNumType GetNumType( USHORT n )
+inline SvxExtNumType GetNumType( sal_uInt16 n )
{
return (SvxExtNumType)(4 < n ? n + 4 : n );
}
@@ -1984,7 +1993,7 @@ SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage()
{
}
-BOOL SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
{
SwFmtFtnAtTxtEnd aFtn( aFtnNtAtTextEndCB.IsChecked()
? ( aFtnNtNumCB.IsChecked()
@@ -2003,7 +2012,7 @@ BOOL SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
// no break;
case FTNEND_ATTXTEND_OWNNUMSEQ:
- aFtn.SetOffset( static_cast< USHORT >( aFtnOffsetFld.GetValue()-1 ) );
+ aFtn.SetOffset( static_cast< sal_uInt16 >( aFtnOffsetFld.GetValue()-1 ) );
// no break;
}
@@ -2024,17 +2033,17 @@ BOOL SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
// no break;
case FTNEND_ATTXTEND_OWNNUMSEQ:
- aEnd.SetOffset( static_cast< USHORT >( aEndOffsetFld.GetValue()-1 ) );
+ aEnd.SetOffset( static_cast< sal_uInt16 >( aEndOffsetFld.GetValue()-1 ) );
// no break;
}
rSet.Put( aFtn );
rSet.Put( aEnd );
- return TRUE;
+ return sal_True;
}
-void SwSectionFtnEndTabPage::ResetState( BOOL bFtn,
+void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn,
const SwFmtFtnEndAtTxtEnd& rAttr )
{
CheckBox *pNtAtTextEndCB, *pNtNumCB, *pNtNumFmtCB;
@@ -2071,7 +2080,7 @@ void SwSectionFtnEndTabPage::ResetState( BOOL bFtn,
pOffsetFld = &aEndOffsetFld;
}
- USHORT eState = rAttr.GetValue();
+ sal_uInt16 eState = rAttr.GetValue();
switch( eState )
{
case FTNEND_ATTXTEND_OWNNUMANDFMT:
@@ -2095,31 +2104,31 @@ void SwSectionFtnEndTabPage::ResetState( BOOL bFtn,
switch( eState )
{
case FTNEND_ATPGORDOCEND:
- pNtNumCB->Enable( FALSE );
+ pNtNumCB->Enable( sal_False );
// no break;
case FTNEND_ATTXTEND:
- pNtNumFmtCB->Enable( FALSE );
- pOffsetFld->Enable( FALSE );
- pOffsetTxt->Enable( FALSE );
+ pNtNumFmtCB->Enable( sal_False );
+ pOffsetFld->Enable( sal_False );
+ pOffsetTxt->Enable( sal_False );
// no break;
case FTNEND_ATTXTEND_OWNNUMSEQ:
- pNumViewBox->Enable( FALSE );
- pPrefixFT->Enable( FALSE );
- pPrefixED->Enable( FALSE );
- pSuffixFT->Enable( FALSE );
- pSuffixED->Enable( FALSE );
+ pNumViewBox->Enable( sal_False );
+ pPrefixFT->Enable( sal_False );
+ pPrefixED->Enable( sal_False );
+ pSuffixFT->Enable( sal_False );
+ pSuffixED->Enable( sal_False );
// no break;
}
}
void SwSectionFtnEndTabPage::Reset( const SfxItemSet& rSet )
{
- ResetState( TRUE, (const SwFmtFtnAtTxtEnd&)rSet.Get(
- RES_FTN_AT_TXTEND, FALSE ));
- ResetState( FALSE, (const SwFmtEndAtTxtEnd&)rSet.Get(
- RES_END_AT_TXTEND, FALSE ));
+ ResetState( sal_True, (const SwFmtFtnAtTxtEnd&)rSet.Get(
+ RES_FTN_AT_TXTEND, sal_False ));
+ ResetState( sal_False, (const SwFmtEndAtTxtEnd&)rSet.Get(
+ RES_END_AT_TXTEND, sal_False ));
}
SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent,
@@ -2130,7 +2139,7 @@ SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent,
IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox )
{
- BOOL bFoot = &aFtnNtAtTextEndCB == pBox || &aFtnNtNumCB == pBox ||
+ sal_Bool bFoot = &aFtnNtAtTextEndCB == pBox || &aFtnNtNumCB == pBox ||
&aFtnNtNumFmtCB == pBox ;
CheckBox *pNumBox, *pNumFmtBox, *pEndBox;
@@ -2167,9 +2176,9 @@ IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox )
pSuffixED = &aEndSuffixED;
}
- BOOL bEnableAtEnd = STATE_CHECK == pEndBox->GetState();
- BOOL bEnableNum = bEnableAtEnd && STATE_CHECK == pNumBox->GetState();
- BOOL bEnableNumFmt = bEnableNum && STATE_CHECK == pNumFmtBox->GetState();
+ sal_Bool bEnableAtEnd = STATE_CHECK == pEndBox->GetState();
+ sal_Bool bEnableNum = bEnableAtEnd && STATE_CHECK == pNumBox->GetState();
+ sal_Bool bEnableNumFmt = bEnableNum && STATE_CHECK == pNumFmtBox->GetState();
pNumBox->Enable( bEnableAtEnd );
pOffsetTxt->Enable( bEnableNum );
@@ -2199,7 +2208,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get();
long nHtmlMode = pHtmlOpt->GetExportMode();
- BOOL bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() );
+ sal_Bool bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() );
if(bWeb)
{
RemoveTabPage(TP_SECTION_FTNENDNOTES);
@@ -2213,7 +2222,7 @@ SwSectionPropertyTabDialog::~SwSectionPropertyTabDialog()
{
}
-void SwSectionPropertyTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
+void SwSectionPropertyTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
if( TP_BACKGROUND == nId )
{
@@ -2223,8 +2232,8 @@ void SwSectionPropertyTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
}
else if( TP_COLUMN == nId )
{
- ((SwColumnPage&)rPage).ShowBalance(TRUE);
- ((SwColumnPage&)rPage).SetInSection(TRUE);
+ ((SwColumnPage&)rPage).ShowBalance(sal_True);
+ ((SwColumnPage&)rPage).SetInSection(sal_True);
}
else if(TP_SECTION_INDENTS == nId)
((SwSectionIndentTabPage&)rPage).SetWrtShell(rWrtSh);
@@ -2243,13 +2252,14 @@ SwSectionIndentTabPage::SwSectionIndentTabPage( Window *pParent, const SfxItemSe
Link aLk = LINK(this, SwSectionIndentTabPage, IndentModifyHdl);
aBeforeMF.SetModifyHdl(aLk);
aAfterMF.SetModifyHdl(aLk);
+ aPreviewWin.SetAccessibleName(aIndentFL.GetText());
}
SwSectionIndentTabPage::~SwSectionIndentTabPage()
{
}
-BOOL SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet)
+sal_Bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet)
{
if(aBeforeMF.IsValueModified() ||
aAfterMF.IsValueModified())
@@ -2259,13 +2269,13 @@ BOOL SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet)
static_cast< long >(aAfterMF.Denormalize(aAfterMF.GetValue(FUNIT_TWIP))), 0, 0, RES_LR_SPACE);
rSet.Put(aLRSpace);
}
- return TRUE;
+ return sal_True;
}
void SwSectionIndentTabPage::Reset( const SfxItemSet& rSet)
{
//this page doesn't show up in HTML mode
- FieldUnit aMetric = ::GetDfltMetric(FALSE);
+ FieldUnit aMetric = ::GetDfltMetric(sal_False);
SetMetric(aBeforeMF, aMetric);
SetMetric(aAfterMF , aMetric);
@@ -2307,7 +2317,7 @@ IMPL_LINK(SwSectionIndentTabPage, IndentModifyHdl, MetricField*, EMPTYARG)
{
aPreviewWin.SetLeftMargin( static_cast< long >(aBeforeMF.Denormalize(aBeforeMF.GetValue(FUNIT_TWIP))) );
aPreviewWin.SetRightMargin( static_cast< long >(aAfterMF.Denormalize(aAfterMF.GetValue(FUNIT_TWIP))) );
- aPreviewWin.Draw(TRUE);
+ aPreviewWin.Draw(sal_True);
return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 12:40:47 +0000