[Libreoffice-commits] .: basctl/source cui/source
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Nov 16 21:21:56 PST 2010
basctl/source/basicide/basidesh.src | 20 ++++++++-
basctl/source/basicide/bastype2.cxx | 11 +++--
basctl/source/basicide/bastype2.hxx | 4 -
basctl/source/basicide/bastype3.cxx | 20 ++++-----
basctl/source/basicide/moduldlg.cxx | 32 +++++++-------
basctl/source/basicide/tbxctl.cxx | 7 +--
cui/source/customize/acccfg.hrc | 79 +++++++++++++++++-------------------
cui/source/customize/cfgutil.cxx | 14 +++---
cui/source/customize/selector.cxx | 9 ++--
cui/source/customize/selector.hrc | 11 ++---
cui/source/customize/selector.src | 4 -
cui/source/dialogs/SpellDialog.cxx | 7 ---
cui/source/dialogs/SpellDialog.hrc | 3 -
cui/source/dialogs/SpellDialog.src | 9 ----
cui/source/dialogs/cuihyperdlg.cxx | 2
cui/source/dialogs/iconcdlg.cxx | 37 ++++------------
cui/source/dialogs/scriptdlg.cxx | 3 -
cui/source/dialogs/thesdlg.cxx | 10 +---
cui/source/dialogs/thesdlg.hrc | 3 -
cui/source/dialogs/thesdlg.src | 16 ++-----
cui/source/dialogs/thesdlg_impl.hxx | 19 ++++----
cui/source/inc/SpellDialog.hxx | 57 ++++++++++++-------------
cui/source/inc/cfgutil.hxx | 20 ++++++---
cui/source/inc/iconcdlg.hxx | 7 ---
cui/source/inc/selector.hxx | 14 +++++-
25 files changed, 209 insertions(+), 209 deletions(-)
New commits:
commit 500024ad95030f773931e53518198a6be8afd416
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Nov 16 18:59:15 2010 -0800
HC Cleanup - components
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 9d5e121..d1224e1 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -354,34 +354,42 @@ String RID_STR_REMOVEWATCH
{
Text [ en-US ] = "Watch:" ;
};
+
String RID_STR_STACK
{
Text [ en-US ] = "Calls: " ;
};
+
String RID_STR_USERMACROS
{
Text [ en-US ] = "My Macros" ;
};
+
String RID_STR_USERDIALOGS
{
Text [ en-US ] = "My Dialogs" ;
};
+
String RID_STR_USERMACROSDIALOGS
{
Text [ en-US ] = "My Macros & Dialogs" ;
};
+
String RID_STR_SHAREMACROS
{
Text [ en-US ] = "%PRODUCTNAME Macros" ;
};
+
String RID_STR_SHAREDIALOGS
{
Text [ en-US ] = "%PRODUCTNAME Dialogs" ;
};
+
String RID_STR_SHAREMACROSDIALOGS
{
Text [ en-US ] = "%PRODUCTNAME Macros & Dialogs" ;
};
+
Menu RID_POPUP_BRKPROPS
{
Text [ en-US ] = "Properties" ;
@@ -407,6 +415,7 @@ Menu RID_POPUP_BRKPROPS
};
};
};
+
Menu RID_POPUP_BRKDLG
{
Text [ en-US ] = "Manage Breakpoints" ;
@@ -421,6 +430,7 @@ Menu RID_POPUP_BRKDLG
};
};
};
+
Menu RID_POPUP_TABBAR
{
DefaultItemId = SID_BASICIDE_HIDECURPAGE ;
@@ -483,6 +493,7 @@ Menu RID_POPUP_TABBAR
};
};
};
+
Menu RID_POPUP_DLGED
{
DefaultItemId = SID_SHOW_PROPERTYBROWSER ;
@@ -496,6 +507,7 @@ Menu RID_POPUP_DLGED
};
};
};
+
ImageList RID_IMGLST_LAYOUT
{
Prefix = "im";
@@ -513,6 +525,7 @@ Image RID_IMG_LOCKED
ImageBitmap = Bitmap { File = "locked.bmp" ; };
MASKCOLOR
};
+
Image RID_IMG_INSTALLATION
{
ImageBitmap = Bitmap { File = "harddisk_16.png"; };
@@ -562,32 +575,37 @@ String RID_STR_QUERYREPLACEMACRO
{
Text [ en-US ] = "Do you want to overwrite the XX macro?" ;
};
+
String RID_STR_TRANSLATION_NOTLOCALIZED
{
Text [ en-US ] = "<Not localized>" ;
};
+
String RID_STR_TRANSLATION_DEFAULT
{
Text [ en-US ] = "[Default Language]" ;
};
+
String RID_STR_DOCUMENT_OBJECTS
{
Text [ en-US ] = "Document Objects" ;
};
+
String RID_STR_USERFORMS
{
Text [ en-US ] = "Forms" ;
};
+
String RID_STR_NORMAL_MODULES
{
Text [ en-US ] = "Modules" ;
};
+
String RID_STR_CLASS_MODULES
{
Text [ en-US ] = "Class Modules" ;
};
-
String RID_STR_DLGIMP_CLASH_RENAME
{
Text [ en-US ] = "Rename" ;
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 81ff61f..b030b26 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -697,8 +697,12 @@ BOOL BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
}
SvLBoxEntry* BasicTreeListBox::AddEntry(
- const String& rText, const Image& rImage,
- SvLBoxEntry* pParent, bool bChildrenOnDemand, std::auto_ptr< BasicEntry > aUserData )
+ const String& rText,
+ const Image& rImage,
+ SvLBoxEntry* pParent,
+ bool bChildrenOnDemand,
+ std::auto_ptr< BasicEntry > aUserData
+)
{
SvLBoxEntry* p = InsertEntry(
rText, rImage, rImage, pParent, bChildrenOnDemand, LIST_APPEND,
@@ -769,8 +773,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
if ( sFactoryURL.getLength() )
{
- rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
- FALSE /* small */ );
+ rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), FALSE );
}
else
{
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 7c6337c..f2464d6 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -205,7 +205,7 @@ public:
bool IsValidEntry( SvLBoxEntry* pEntry );
SvLBoxEntry* AddEntry( const String& rText, const Image& rImage,
- SvLBoxEntry* pParent, bool bChildrenOnDemand,
+ SvLBoxEntry* pParent, bool bChildrenOnDemand,
std::auto_ptr< BasicEntry > aUserData );
String GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const;
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 866e9f0..172dff9 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -62,7 +62,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
return;
LibraryLocation eLocation( aDesc.GetLocation() );
- BasicEntryType eType( aDesc.GetType() );
+ BasicEntryType eType( aDesc.GetType() );
if ( eType == OBJ_TYPE_DOCUMENT )
{
@@ -88,8 +88,8 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
if ( bOK )
{
- // load module library
- BOOL bModLibLoaded = FALSE;
+ // load module library
+ BOOL bModLibLoaded = FALSE;
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
{
if ( !xModLibContainer->isLibraryLoaded( aOULibName ) )
@@ -103,7 +103,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
// load dialog library
BOOL bDlgLibLoaded = FALSE;
- Reference< script::XLibraryContainer > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
+ Reference< script::XLibraryContainer > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) )
{
if ( !xDlgLibContainer->isLibraryLoaded( aOULibName ) )
@@ -131,7 +131,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
}
}
}
- else if ( eType == OBJ_TYPE_DOCUMENT_OBJECTS
+ else if ( eType == OBJ_TYPE_DOCUMENT_OBJECTS
|| eType == OBJ_TYPE_USERFORMS
|| eType == OBJ_TYPE_NORMAL_MODULES
|| eType == OBJ_TYPE_CLASS_MODULES )
@@ -194,12 +194,12 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
case 4:
case 3:
case 2:
- case 1:
+ case 1:
{
aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
}
break;
- case 0:
+ case 0:
{
aDocument = ((BasicDocumentEntry*)pEntry->GetUserData())->GetDocument();
}
@@ -299,12 +299,12 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
case 4:
case 3:
case 2:
- case 1:
+ case 1:
{
aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
}
break;
- case 0:
+ case 0:
{
BasicDocumentEntry* pBasicDocumentEntry = (BasicDocumentEntry*)pEntry->GetUserData();
if ( pBasicDocumentEntry )
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 660c674..6c88b8b 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -223,8 +223,8 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
// check if module library is not loaded, readonly or password protected
Reference< script::XLibraryContainer2 > xModLibContainer( rDestDoc.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOUDestLibName ) )
- {
- if ( !xModLibContainer->isLibraryLoaded( aOUDestLibName ) )
+ {
+ if ( !xModLibContainer->isLibraryLoaded( aOUDestLibName ) )
bValid = FALSE;
if ( xModLibContainer->isLibraryReadOnly( aOUDestLibName ) )
@@ -239,7 +239,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
Reference< script::XLibraryContainer2 > xDlgLibContainer( rDestDoc.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOUDestLibName ) )
{
- if ( !xDlgLibContainer->isLibraryLoaded( aOUDestLibName ) )
+ if ( !xDlgLibContainer->isLibraryLoaded( aOUDestLibName ) )
bValid = FALSE;
if ( xDlgLibContainer->isLibraryReadOnly( aOUDestLibName ) )
@@ -432,7 +432,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv
try
{
if ( eType == OBJ_TYPE_MODULE ) // module
- {
+ {
// get module
::rtl::OUString aModule;
if ( rSourceDoc.getModule( aSourceLibName, aSourceName, aModule ) )
@@ -593,7 +593,7 @@ ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) :
aBasicBox.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY );
aBasicBox.EnableInplaceEditing( TRUE );
aBasicBox.SetMode( nMode );
- aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
+ aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
WB_HASBUTTONS | WB_HASBUTTONSATROOT |
WB_HSCROLL );
aBasicBox.ScanAllEntries();
@@ -603,7 +603,7 @@ ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) :
}
void ObjectPage::SetCurrentEntry( BasicEntryDescriptor& rDesc )
-{
+{
aBasicBox.SetCurrentEntry( rDesc );
}
@@ -634,7 +634,7 @@ void ObjectPage::CheckButtons()
aEditButton.Disable();
else
aEditButton.Enable();
- }
+ }
else
aEditButton.Disable();
@@ -708,7 +708,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
sal_uInt16 nIndex = 0;
aModName = aModName.GetToken( 0, ' ', nIndex );
}
- SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(),
+ SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(),
aModName, aBasicBox.ConvertType( aDesc.GetType() ) );
pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
}
@@ -791,7 +791,7 @@ bool ObjectPage::GetSelection( ScriptDocument& rDocument, String& rLibName )
if ( bOK )
bRet = true;
-
+
return bRet;
}
@@ -802,8 +802,8 @@ void ObjectPage::NewModule()
if ( GetSelection( aDocument, aLibName ) )
{
- String aModName;
- createModImpl( static_cast<Window*>( this ), aDocument,
+ String aModName;
+ createModImpl( static_cast<Window*>( this ), aDocument,
aBasicBox, aLibName, aModName, true );
}
}
@@ -838,7 +838,7 @@ void ObjectPage::NewDialog()
if ( !aDocument.createDialog( aLibName, aDlgName, xISP ) )
return;
- SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, BASICIDE_TYPE_DIALOG );
+ SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, BASICIDE_TYPE_DIALOG );
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
@@ -998,7 +998,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : 0;
if ( pBasic )
pModule = pBasic->FindModule( aModName );
- SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE );
+ SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE );
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
@@ -1028,10 +1028,10 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
{
if( !rBasicBox.IsExpanded( pLibSubEntry ) )
rBasicBox.Expand( pLibSubEntry );
- pSubRootEntry = pLibSubEntry;
+ pSubRootEntry = pLibSubEntry;
}
}
-
+
SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
if ( !pEntry )
{
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index bdea6b4..f7cb3ba 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -181,9 +181,10 @@ void TbxControls::StateChanged( USHORT nSID, SfxItemState eState,
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nTemp ));
- Image aImage = GetImage( m_xFrame,
+ Image aImage = GetImage( m_xFrame,
aSlotURL,
- hasBigImages() );
+ hasBigImages()
+ );
ToolBox& rBox = GetToolBox();
rBox.SetItemImage(GetId(), aImage);
nLastSlot = nLastEnum;
diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index dc16a69..ccc583d 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -26,44 +26,43 @@
************************************************************************/
#define GRP_FUNCTIONS 22
-#define BTN_ACC_OK 1
-#define BTN_ACC_CANCEL 2
-#define BTN_ACC_CHANGE 3
-#define BTN_ACC_REMOVE 4
-#define BOX_ACC_ENTRIES 5
-#define TXT_ACC_DESCRIPTIONTEXT 6
-#define TXT_ACC_DESCRIPTIONINFO 7
-#define GRP_ACC_KEYBOARD 8
-#define TXT_ACC_GROUP 9
-#define BOX_ACC_GROUP 10
-#define TXT_ACC_FUNCTION 11
-#define BOX_ACC_FUNCTION 12
-#define TXT_ACC_KEY 13
-#define BOX_ACC_KEY 14
-#define GRP_ACC_FUNCTIONS 15
-#define BTN_RESET 20
-#define BTN_LOAD 40
-#define BTN_SAVE 41
-#define RB_OFFICE 44
-#define RB_MODULE 45
-#define STR_LOADACCELCONFIG 46
-#define STR_SAVEACCELCONFIG 47
-
-#define IMG_HARDDISK 48
-#define STR_PRODMACROS 50
-#define STR_MYMACROS 51
-#define IMG_LIB 52
-#define IMG_MACRO 54
-#define IMG_DOC 56
-#define STR_GROUP_STYLES 58
-#define STR_PDF_EXPORT_SEND 59
-#define STR_RECHECK_DOCUMENT 60
-#define IMG_INFO 61
-#define STR_BASICNAME 62
-#define BMP_COLLAPSED 63
-#define BMP_EXPANDED 64
-#define STR_BASICMACROS 67
-#define STR_DLG_MACROS 68
-#define STR_HUMAN_APPNAME 69
-#define STR_FILTERNAME_CFG 70
+#define BTN_ACC_OK 1
+#define BTN_ACC_CANCEL 2
+#define BTN_ACC_CHANGE 3
+#define BTN_ACC_REMOVE 4
+#define BOX_ACC_ENTRIES 5
+#define TXT_ACC_DESCRIPTIONTEXT 6
+#define TXT_ACC_DESCRIPTIONINFO 7
+#define GRP_ACC_KEYBOARD 8
+#define TXT_ACC_GROUP 9
+#define BOX_ACC_GROUP 10
+#define TXT_ACC_FUNCTION 11
+#define BOX_ACC_FUNCTION 12
+#define TXT_ACC_KEY 13
+#define BOX_ACC_KEY 14
+#define GRP_ACC_FUNCTIONS 15
+#define BTN_RESET 20
+#define BTN_LOAD 40
+#define BTN_SAVE 41
+#define RB_OFFICE 44
+#define RB_MODULE 45
+#define STR_LOADACCELCONFIG 46
+#define STR_SAVEACCELCONFIG 47
+#define IMG_HARDDISK 48
+#define STR_PRODMACROS 50
+#define STR_MYMACROS 51
+#define IMG_LIB 52
+#define IMG_MACRO 54
+#define IMG_DOC 56
+#define STR_GROUP_STYLES 58
+#define STR_PDF_EXPORT_SEND 59
+#define STR_RECHECK_DOCUMENT 60
+#define IMG_INFO 61
+#define STR_BASICNAME 62
+#define BMP_COLLAPSED 63
+#define BMP_EXPANDED 64
+#define STR_BASICMACROS 67
+#define STR_DLG_MACROS 68
+#define STR_HUMAN_APPNAME 69
+#define STR_FILTERNAME_CFG 70
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index fe5e821..8b9b93d 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -902,9 +902,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
}
if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay )
{
-
-// We call acquire on the XBrowseNode so that it does not
-// get autodestructed and become invalid when accessed later.
+// We call acquire on the XBrowseNode so that it does not
+// get autodestructed and become invalid when accessed later.
theChild->acquire();
SfxGroupInfo_Impl* pInfo =
@@ -959,7 +958,11 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
MakeVisible( GetEntry( 0,0 ) );
SetUpdateMode( TRUE );
}
-Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode )
+Image SfxConfigGroupListBox_Impl::GetImage(
+ Reference< browse::XBrowseNode > node,
+ Reference< XComponentContext > xCtx,
+ bool bIsRootNode
+)
{
Image aImage;
if ( bIsRootNode )
@@ -1013,8 +1016,7 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
}
if( factoryURL.getLength() > 0 )
{
- aImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false );
+ aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
}
else
{
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 338a49f..d5552dd 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -617,7 +617,11 @@ void SvxConfigGroupListBox_Impl::Init()
SetUpdateMode( TRUE );
}
-Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode )
+Image SvxConfigGroupListBox_Impl::GetImage(
+ Reference< browse::XBrowseNode > node,
+ Reference< XComponentContext > xCtx,
+ bool bIsRootNode
+)
{
Image aImage;
if ( bIsRootNode )
@@ -666,8 +670,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
}
if( factoryURL.getLength() > 0 )
{
- aImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false);
+ aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
}
else
{
diff --git a/cui/source/customize/selector.hrc b/cui/source/customize/selector.hrc
index cdb1225..a8dee0c 100644
--- a/cui/source/customize/selector.hrc
+++ b/cui/source/customize/selector.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -35,10 +35,11 @@
#define BTN_SELECTOR_HELP 8
#define GRP_SELECTOR_DESCRIPTION 9
#define TXT_SELECTOR_DESCRIPTION 10
-#define IMG_HARDDISK 1
-#define IMG_LIB 3
-#define IMG_MACRO 5
-#define IMG_DOC 7
+
+#define IMG_HARDDISK 1
+#define IMG_LIB 3
+#define IMG_MACRO 5
+#define IMG_DOC 7
#define STR_SELECTOR_ADD 310
#define STR_SELECTOR_CLOSE 311
diff --git a/cui/source/customize/selector.src b/cui/source/customize/selector.src
index 466b7e3..34e7a77 100644
--- a/cui/source/customize/selector.src
+++ b/cui/source/customize/selector.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -122,7 +122,7 @@ ModelessDialog RID_DLG_SCRIPTSELECTOR
String STR_PRODMACROS
{
Text [ en-US ] = "%PRODUCTNAME Macros";
- };
+ };
Image IMG_HARDDISK
{
ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 594574c..5e86ed2 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -226,7 +226,6 @@ SpellDialog::SpellDialog(
aBackgroundGB ( this, CUI_RES( GB_BACKGROUND ) ),
aVendorImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
- aVendorImageHC ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ),
aResumeST ( CUI_RES(ST_RESUME )),
aIgnoreOnceST ( aIgnorePB.GetText()),
@@ -879,9 +878,8 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives();
if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() )
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
::rtl::OUString sSuggestionImageUrl =
- SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName, bHighContrast );
+ SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName );
aVendorImageFI.SetImage( lcl_GetImageFromPngUrl( sSuggestionImageUrl ) );
uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY );
if( xDisplayName.is() )
@@ -889,8 +887,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
}
else
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- aVendorImageFI.SetImage( bHighContrast ? aVendorImageHC : aVendorImage );
+ aVendorImageFI.SetImage( aVendorImage );
}
if( sVendor.Len() )
diff --git a/cui/source/dialogs/SpellDialog.hrc b/cui/source/dialogs/SpellDialog.hrc
index 8cac9b8..d51ec1e 100644
--- a/cui/source/dialogs/SpellDialog.hrc
+++ b/cui/source/dialogs/SpellDialog.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -51,5 +51,4 @@
#define PB_EXPLAIN 55
#define IMG_VENDOR 56
#define IMG_DEFAULT_VENDOR 57
-#define IMG_DEFAULT_VENDOR_HC 58
#define PB_IGNORERULE 59
diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src
index 3a10ead..cc14ba6 100644
--- a/cui/source/dialogs/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -52,7 +52,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
Size = MAP_APPFONT ( 270, 21 ) ;
Hide = TRUE;
};
-
+
FixedText FT_LANGUAGE
{
Pos = MAP_APPFONT( 6, 8 );
@@ -214,10 +214,5 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
{
ImageBitmap = Bitmap { File = "vendor01.png"; };
};
- Image IMG_DEFAULT_VENDOR_HC
- {
- ImageBitmap = Bitmap { File = "vendor01h.png"; };
- };
-
};
// ********************************************************************** EOF
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index d308d60..028fb6a 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 0cae816..51baa78 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -380,11 +380,15 @@ IconChoiceDialog ::~IconChoiceDialog ()
|
\**********************************************************************/
-SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
- const Image& rChoiceIcon,
- CreatePage pCreateFunc /* != 0 */,
- GetPageRanges pRangesFunc /* darf 0 sein */,
- BOOL bItemsOnDemand, ULONG /*nPos*/ )
+SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
+ USHORT nId,
+ const String& rIconText,
+ const Image& rChoiceIcon,
+ CreatePage pCreateFunc /* != 0 */,
+ GetPageRanges pRangesFunc /* darf 0 sein */,
+ BOOL bItemsOnDemand,
+ ULONG /*nPos*/
+)
{
IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
pRangesFunc,
@@ -400,27 +404,6 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String&
return pEntry;
}
-SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
- const Image& rChoiceIcon,
- const Image& rChoiceIconHC,
- CreatePage pCreateFunc /* != 0 */,
- GetPageRanges pRangesFunc /* darf 0 sein */,
- BOOL bItemsOnDemand, ULONG /*nPos*/ )
-{
- IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
- pRangesFunc,
- bItemsOnDemand );
- maPageList.Insert ( pData, LIST_APPEND );
-
- pData->fnGetRanges = pRangesFunc;
- pData->bOnDemand = bItemsOnDemand;
-
- USHORT *pId = new USHORT ( nId );
- SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC );
- pEntry->SetUserData ( (void*) pId );
- return pEntry;
-}
-
/**********************************************************************
|
| remove page
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 047d27a..6aa0676 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -387,8 +387,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
SvLBoxEntry * p;
if( nBitmap == IMG_DOCUMENT && factoryURL.getLength() > 0 )
{
- Image aImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false );
+ Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
p = InsertEntry(
rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
aUserData.release()); // XXX possible leak
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index f6712c3..6a99064 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -307,7 +307,6 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog )
aCancelBtn ( pDialog, CUI_RES( BTN_THES_CANCEL ) ),
aErrStr ( CUI_RES( STR_ERR_TEXTNOTFOUND ) ),
aVendorDefaultImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
- aVendorDefaultImageHC ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ),
xThesaurus ( NULL ),
aLookUpText (),
nLookUpLanguage ( LANGUAGE_NONE ),
@@ -567,15 +566,13 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage()
SvtLinguConfig aCfg;
if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
{
- const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-
Image aImage;
String sThesImplName( lcl_GetThesImplName( SvxCreateLocale( nLookUpLanguage ) ) );
- OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName, bHC ) );
+ OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName ) );
if (sThesImplName.Len() > 0 && aThesDialogImageUrl.getLength() > 0)
aImage = Image( lcl_GetImageFromPngUrl( aThesDialogImageUrl ) );
else
- aImage = bHC ? aVendorDefaultImageHC : aVendorDefaultImage;
+ aImage = aVendorDefaultImage;
aVendorImageFI.SetImage( aImage );
}
@@ -589,8 +586,7 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo
SvtLinguConfig aCfg;
if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
{
- const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
- Image aImage( bHC ? pThis->aVendorDefaultImageHC : pThis->aVendorDefaultImage );
+ Image aImage( pThis->aVendorDefaultImage );
pThis->aVendorImageFI.SetImage( aImage );
pThis->aVendorImageFI.Show();
diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc
index 3763916..091838e 100755
--- a/cui/source/dialogs/thesdlg.hrc
+++ b/cui/source/dialogs/thesdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -43,7 +43,6 @@
#define CT_THES_ALTERNATIVES 25
#define IMG_VENDOR 26
#define IMG_DEFAULT_VENDOR 27
-#define IMG_DEFAULT_VENDOR_HC 28
#define STR_ERR_TEXTNOTFOUND 101
diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src
index 058435d..ca0f69c 100755
--- a/cui/source/dialogs/thesdlg.src
+++ b/cui/source/dialogs/thesdlg.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -24,12 +24,12 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-
+
#include "cuires.hrc"
#include "thesdlg.hrc"
#include "helpid.hrc"
#include <svx/svxids.hrc> // SID_THESAURUS
-
+
// RID_SVXDLG_THES -------------------------------------------------------
ModalDialog RID_SVXDLG_THESAURUS
@@ -47,7 +47,7 @@ ModalDialog RID_SVXDLG_THESAURUS
Size = MAP_APPFONT ( 235, 0 ) ; // correct size will be applied at runtime
Hide = TRUE;
};
-
+
ImageButton BTN_LEFT
{
Pos = MAP_APPFONT ( 5 , 15 ) ;
@@ -66,7 +66,7 @@ ModalDialog RID_SVXDLG_THESAURUS
{
DropDown = TRUE ;
Pos = MAP_APPFONT ( 24 , 16 ) ;
- Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines
+ Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines
};
MenuButton MB_LANGUAGE
{
@@ -74,7 +74,7 @@ ModalDialog RID_SVXDLG_THESAURUS
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Language" ;
};
-
+
FixedText FT_THES_ALTERNATIVES
{
Pos = MAP_APPFONT ( 5 , 33 ) ;
@@ -138,9 +138,5 @@ ModalDialog RID_SVXDLG_THESAURUS
{
ImageBitmap = Bitmap { File = "vendor01.png"; };
};
- Image IMG_DEFAULT_VENDOR_HC
- {
- ImageBitmap = Bitmap { File = "vendor01h.png"; };
- };
};
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index 573eaed..3e38287 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -86,7 +86,7 @@ public:
// ComboBox
virtual void Modify();
};
-
+
// class ReplaceEdit_Impl --------------------------------------------------
class ReplaceEdit_Impl : public Edit
@@ -108,7 +108,7 @@ public:
virtual void SetText( const XubString& rStr );
virtual void SetText( const XubString& rStr, const Selection& rNewSelection );
};
-
+
// class ThesaurusAlternativesCtrl_Impl ----------------------------------
class AlternativesExtraData
@@ -123,7 +123,7 @@ public:
bHeader(bIsHeader)
{
}
-
+
bool IsHeader() const { return bHeader; }
const String& GetText() const { return sText; }
};
@@ -141,7 +141,7 @@ public:
};
-class ThesaurusAlternativesCtrl_Impl :
+class ThesaurusAlternativesCtrl_Impl :
public SvxCheckListBox
{
SvxThesaurusDialog_Impl & m_rDialogImpl;
@@ -191,7 +191,6 @@ struct SvxThesaurusDialog_Impl
String aErrStr;
Image aVendorDefaultImage;
- Image aVendorDefaultImageHC;
uno::Reference< linguistic2::XThesaurus > xThesaurus;
OUString aLookUpText;
@@ -199,7 +198,7 @@ struct SvxThesaurusDialog_Impl
std::stack< OUString > aLookUpHistory;
bool m_bWordFound;
-
+
// Handler
DECL_LINK( LeftBtnHdl_Impl, Button * );
DECL_LINK( LanguageHdl_Impl, MenuButton * );
@@ -210,14 +209,14 @@ struct SvxThesaurusDialog_Impl
DECL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox * );
DECL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl * );
-
-
+
+
SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog );
~SvxThesaurusDialog_Impl();
- uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
+ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException);
-
+
bool UpdateAlternativesBox_Impl();
void UpdateVendorImage();
void LookUp( const String &rText );
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index bea380d..42513ae 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -81,7 +81,7 @@ private:
bool m_bIsUndoEditMode;
Link m_aModifyLink;
-
+
void CallModifyLink() {m_aModifyLink.Call(this);}
SpellDialog* GetSpellDialog() const {return (SpellDialog*)GetParent();}
@@ -93,28 +93,28 @@ public:
~SentenceEditWindow_Impl();
void SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;}
-
+
void SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd );
void SetText( const String& rStr );
-
- bool MarkNextError( bool bIgnoreCurrentError );
+
+ bool MarkNextError( bool bIgnoreCurrentError );
void ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage);
void MoveErrorMarkTo(USHORT nErrorStart, USHORT nErrorEnd, bool bGrammar);
String GetErrorText() const;
void RestoreCurrentError();
-
+
void SetAlternatives(
com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> );
-
+
const SpellErrorDescription* GetAlternatives();
void ResetModified() { GetTextEngine()->SetModified(FALSE); m_bIsUndoEditMode = false;}
BOOL IsModified() const { return GetTextEngine()->IsModified(); }
-
+
bool IsUndoEditMode() const { return m_bIsUndoEditMode;}
void SetUndoEditMode(bool bSet);
-
+
svx::SpellPortions CreateSpellPortions( bool bSetIgnoreFlag ) const;
void ResetUndo();
@@ -135,15 +135,15 @@ class SpellDialogChildWindow;
class ExplainButton : public PushButton
{
String m_sExplanation;
-
+
virtual void RequestHelp( const HelpEvent& rHEvt );
virtual void Click();
-public:
+public:
ExplainButton( Window* pParent, const ResId& rResId ) : PushButton( pParent, rResId ){}
- ~ExplainButton();
+ ~ExplainButton();
void SetExplanation( const String& rText ) {m_sExplanation = rText;}
bool HasExplanation() { return m_sExplanation.Len() > 0;}
-
+
};
class SpellDialog : public SfxModelessDialog
@@ -152,23 +152,23 @@ class SpellDialog : public SfxModelessDialog
friend class SentenceEditWindow_Impl;
private:
-
+
FixedImage aVendorImageFI;
-
+
FixedText aLanguageFT;
SvxLanguageBox aLanguageLB;
-
+
FixedText aNotInDictFT;
- SentenceEditWindow_Impl aSentenceED;
-
+ SentenceEditWindow_Impl aSentenceED;
+
FixedText aSuggestionFT;
ListBox aSuggestionLB;
-
+
PushButton aIgnorePB;
PushButton aIgnoreAllPB;
PushButton aIgnoreRulePB;
MenuButton aAddToDictMB;
-
+
PushButton aChangePB;
PushButton aChangeAllPB;
ExplainButton aExplainPB;
@@ -184,7 +184,6 @@ private:
GroupBox aBackgroundGB;
Image aVendorImage;
- Image aVendorImageHC;
String aResumeST;
String aIgnoreOnceST;
@@ -193,13 +192,13 @@ private:
const String m_sTitleSpelling;
const String m_sTitleSpellingGrammar;
const String m_sTitleSpellingGrammarVendor;
-
+
Size aOldWordEDSize;
Link aDialogUndoLink;
-
+
bool bModified;
bool bFocusLocked;
-
+
svx::SpellDialogChildWindow& rParent;
svx::SpellPortions m_aSavedSentence;
@@ -222,7 +221,7 @@ private:
DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * );
-
+
void StartSpellOptDlg_Impl();
void InitUserDicts();
void UpdateBoxes_Impl();
@@ -237,17 +236,17 @@ private:
/** Retrieves the next sentence.
*/
bool GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the current sentence*/);
- /** Corrects all errors that have been selected to be changed always
+ /** Corrects all errors that have been selected to be changed always
*/
bool ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced);
- void SetTitle_Impl(LanguageType nLang);
+ void SetTitle_Impl(LanguageType nLang);
-protected:
+protected:
virtual void Paint( const Rectangle& rRect );
virtual long Notify( NotifyEvent& rNEvt );
public:
- SpellDialog(
+ SpellDialog(
svx::SpellDialogChildWindow* pChildWindow,
Window * pParent,
SfxBindings* pBindings);
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 150ad35..16203e9 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -39,7 +39,7 @@
#include <com/sun/star/script/browse/XBrowseNode.hpp>
#define _SVSTDARR_STRINGSDTOR
-#include <svl/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <vcl/timer.hxx>
#include <svtools/svtabbx.hxx>
@@ -143,7 +143,7 @@ public:
SvLBoxEntry* GetEntry_Impl( USHORT nId );
SvLBoxEntry* GetEntry_Impl( const String& );
USHORT GetId( SvLBoxEntry *pEntry );
- using Window::GetHelpText;
+ using Window::GetHelpText;
String GetHelpText( SvLBoxEntry *pEntry );
USHORT GetCurId() { return GetId( FirstSelected() ); }
String GetCurCommand();
@@ -170,9 +170,17 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
css::uno::Reference< css::container::XNameAccess > m_xModuleCategoryInfo;
css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
- Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode );
+ Image GetImage(
+ ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node,
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx,
+ bool bIsRootNode
+ );
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel(
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx,
+ ::rtl::OUString& docName
+ );
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
::rtl::OUString parseLocationName( const ::rtl::OUString& location );
void InitModule();
@@ -190,7 +198,7 @@ protected:
public:
SfxConfigGroupListBox_Impl ( Window* pParent,
- const ResId&,
+ const ResId&,
ULONG nConfigMode = 0 );
~SfxConfigGroupListBox_Impl();
void ClearAll();
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index bc82c8d..ce91c6e 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -245,11 +245,6 @@ public :
CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
- SvxIconChoiceCtrlEntry* AddTabPage(
- USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
- CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
- BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
-
void RemoveTabPage( USHORT nId );
void SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index df108d1..14c14e5 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -155,8 +155,16 @@ class SvxConfigGroupListBox_Impl : public SvTreeListBox
Image m_docImage;
::rtl::OUString m_sMyMacros;
::rtl::OUString m_sProdMacros;
- Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode );
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
+ Image GetImage(
+ ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node,
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx,
+ bool bIsRootNode
+ );
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel(
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx,
+ ::rtl::OUString& docName
+ );
private:
void fillScriptList(
More information about the Libreoffice-commits
mailing list