[Libreoffice-commits] .: basctl/inc basctl/source cui/source
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Wed Nov 10 01:03:51 PST 2010
basctl/inc/basidesh.hrc | 3
basctl/source/basicide/basidesh.src | 7 -
basctl/source/basicide/bastype2.cxx | 8 -
basctl/source/basicide/moduldl2.cxx | 11 --
cui/source/customize/acccfg.hrc | 4
cui/source/customize/acccfg.src | 18 ----
cui/source/customize/cfgutil.cxx | 38 ++------
cui/source/customize/selector.cxx | 28 +-----
cui/source/dialogs/hlmarkwn.cxx | 4
cui/source/dialogs/scriptdlg.cxx | 161 ++++++++++++++++--------------------
cui/source/dialogs/scriptdlg.hrc | 10 --
cui/source/dialogs/scriptdlg.src | 22 ----
cui/source/inc/scriptdlg.hxx | 32 +++----
cui/source/options/optpath.cxx | 7 -
14 files changed, 124 insertions(+), 229 deletions(-)
New commits:
commit 1c9cb65c30b77ce3471db9dd73a8ab2fd7f12763
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Nov 9 20:07:12 2010 -0800
Bitmap Tree Cleanup - components
Removed all references to HIGHCONTRAST mode from svtools classes:
SvImpLBox
SvTreeListBox
The reset is just fall out.
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 4ba5df0..67dd151 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.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
@@ -57,7 +57,6 @@
#define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 )
#define RID_PRINTDLG_STRLIST ( RID_BASICIDE_START + 78 )
-#define RID_IMG_LOCKED_HC ( RID_BASICIDE_START + 6 )
#define RID_IMGBTN_REMOVEWATCH ( RID_BASICIDE_START + 8 )
#define RID_IMGBTN_GOTOCALL ( RID_BASICIDE_START + 9 )
#define RID_IMGLST_LAYOUT_HC ( RID_BASICIDE_START + 14 )
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 25c8c46..1437281 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.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
@@ -529,11 +529,6 @@ Image RID_IMG_LOCKED
ImageBitmap = Bitmap { File = "locked.bmp" ; };
MASKCOLOR
};
-Image RID_IMG_LOCKED_HC
-{
- ImageBitmap = Bitmap { File = "locked_h.bmp" ; };
- MASKCOLOR
-};
Image RID_IMG_INSTALLATION
{
ImageBitmap = Bitmap { File = "harddisk_16.png"; };
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 10208b9..0ef6df9 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -718,17 +718,13 @@ SvLBoxEntry* BasicTreeListBox::AddEntry(
SvLBoxEntry* p = InsertEntry(
rText, rImage, rImage, pParent, bChildrenOnDemand, LIST_APPEND,
aUserData.release() ); // XXX possible leak
- SetExpandedEntryBmp( p, rImageHC, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( p, rImageHC, BMP_COLOR_HIGHCONTRAST );
return p;
}
void BasicTreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage, const Image& rImageHC )
{
- SetExpandedEntryBmp( pEntry, rImage, BMP_COLOR_NORMAL );
- SetCollapsedEntryBmp( pEntry, rImage, BMP_COLOR_NORMAL );
- SetExpandedEntryBmp( pEntry, rImageHC, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pEntry, rImageHC, BMP_COLOR_HIGHCONTRAST );
+ SetExpandedEntryBmp( pEntry, rImage );
+ SetCollapsedEntryBmp( pEntry, rImage );
}
LibraryType BasicTreeListBox::GetLibraryType() const
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 8eb60db..fe6dd5a 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.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
@@ -1582,13 +1582,8 @@ SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, ULONG nPos )
if (bProtected)
{
Image aImage(IDEResId(RID_IMG_LOCKED));
- aLibBox.SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aLibBox.SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = Image(IDEResId(RID_IMG_LOCKED_HC));
- aLibBox.SetExpandedEntryBmp(pNewEntry, aImage,
- BMP_COLOR_HIGHCONTRAST);
- aLibBox.SetCollapsedEntryBmp(pNewEntry, aImage,
- BMP_COLOR_HIGHCONTRAST);
+ aLibBox.SetExpandedEntryBmp(pNewEntry, aImage);
+ aLibBox.SetCollapsedEntryBmp(pNewEntry, aImage);
}
// check, if library is link
diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index 483d3dd..f1357b6 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.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
@@ -66,8 +66,6 @@
#define STR_BASICNAME 62
#define BMP_COLLAPSED 63
#define BMP_EXPANDED 64
-#define BMP_COLLAPSED_HC 65
-#define BMP_EXPANDED_HC 66
#define STR_BASICMACROS 67
#define STR_DLG_MACROS 68
#define STR_HUMAN_APPNAME 69
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index a804c14..659f3f9 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.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
@@ -278,7 +278,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
{
File = "plus.bmp" ;
};
- // MaskColor = Color { Predefine = COL_GREEN ; };
};
Image BMP_EXPANDED
{
@@ -286,21 +285,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
{
File = "minus.bmp" ;
};
- // MaskColor = Color { Predefine = COL_GREEN ; };
- };
- Image BMP_EXPANDED_HC
- {
- ImageBitmap = Bitmap
- {
- File = "minus_h.bmp" ;
- };
- };
- Image BMP_COLLAPSED_HC
- {
- ImageBitmap = Bitmap
- {
- File = "plus_h.bmp" ;
- };
};
};
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index a74efb1..0bb57fb 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.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
@@ -463,9 +463,7 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
String m_aStrGroupStyles;
String m_aScriptType;
Image m_collapsedImage;
- Image m_collapsedImage_hc;
Image m_expandedImage;
- Image m_expandedImage_hc;
SvxConfigGroupBoxResource_Impl();
};
@@ -488,9 +486,7 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
m_aStrGroupStyles(String(CUI_RES(STR_GROUP_STYLES))),
m_aScriptType(String(CUI_RES(STR_BASICNAME))),
m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
- m_collapsedImage_hc(CUI_RES(BMP_COLLAPSED_HC)),
- m_expandedImage(CUI_RES(BMP_EXPANDED)),
- m_expandedImage_hc(CUI_RES(BMP_EXPANDED_HC))
+ m_expandedImage(CUI_RES(BMP_EXPANDED))
{
FreeResource();
}
@@ -501,8 +497,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
, pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), bShowSF( FALSE ), bShowBasic( TRUE ), pStylesInfo(0)
{
SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
- SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage, BMP_COLOR_NORMAL );
- SetNodeBitmaps( pImp->m_collapsedImage_hc, pImp->m_expandedImage_hc, BMP_COLOR_HIGHCONTRAST );
+ SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage );
// Check configuration to see whether only Basic macros,
// only Scripting Framework scripts, or both should be listed
@@ -712,7 +707,7 @@ namespace
if ( xContext.is() )
xScripts.set( xContext->getScriptContainer(), UNO_QUERY );
}
-
+
return Reference< XModel >( xScripts, UNO_QUERY );
}
@@ -929,11 +924,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
Image aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_NORMAL );
SvLBoxEntry* pNewEntry =
InsertEntry( uiName, NULL);
- SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_HIGHCONTRAST );
- SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
- SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+ SetExpandedEntryBmp( pNewEntry, aImage );
+ SetCollapsedEntryBmp( pNewEntry, aImage );
pNewEntry->SetUserData( pInfo );
aArr.Insert( pInfo, aArr.Count() );
@@ -1275,11 +1267,8 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
SvLBoxEntry* pNewEntry =
pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
- pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
- pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
- pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+ pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
+ pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
pGrpInfo->sCommand = uri;
pGrpInfo->sLabel = children[n]->getName();
@@ -1458,7 +1447,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
{
bIsRootNode = TRUE;
}
-
+
/* To mimic current starbasic behaviour we
need to make sure that only the current document
is displayed in the config tree. Tests below
@@ -1481,7 +1470,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
if ( bIsRootNode )
{
if ( !( (aName.equals(user) || aName.equals(share) || aName.equals(currentDocTitle) ) ) )
- bDisplay=FALSE;
+ bDisplay=FALSE;
}
if ( children[n].is() && children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay )
{
@@ -1499,11 +1488,8 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
SvLBoxEntry* pNewEntry =
InsertEntry( theChild->getName(), pEntry );
- SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
- SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
- SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+ SetExpandedEntryBmp( pNewEntry, aImage );
+ SetCollapsedEntryBmp(pNewEntry, aImage );
pNewEntry->SetUserData( pGrpInfo );
aArr.Insert( pGrpInfo, aArr.Count() );
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index cdcd76d..6543ab2 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.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
@@ -269,13 +269,8 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
SetNodeBitmaps(
aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
- BMP_COLOR_NORMAL );
-
- SetNodeBitmaps(
- aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
- BMP_COLOR_HIGHCONTRAST );
+ aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
+ );
}
@@ -316,7 +311,7 @@ namespace
if ( xContext.is() )
xScripts.set( xContext->getScriptContainer(), UNO_QUERY );
}
-
+
return Reference< XModel >( xScripts, UNO_QUERY );
}
@@ -420,12 +415,8 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_NORMAL );
- SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
- SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
-
- aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_HIGHCONTRAST );
- SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST );
+ SetExpandedEntryBmp( pNewEntry, aImage );
+ SetCollapsedEntryBmp( pNewEntry, aImage );
SvxGroupInfo_Impl* pInfo =
new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, theChild );
@@ -902,11 +893,8 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
SvLBoxEntry* pNewEntry =
pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
- pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
- pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
- pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+ pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
+ pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
pNewEntry->SetUserData( _pGroupInfo );
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 4b9146f..18d5b70 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.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
@@ -386,8 +386,6 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
pParentEntry,
FALSE, LIST_APPEND,
(void*)pData );
- maLbTree.SetExpandedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
- maLbTree.SetCollapsedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
nEntries++;
}
else
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 963451b..bf62b09 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.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
@@ -87,24 +87,20 @@ void ShowErrorDialog( const Any& aException )
SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) :
SvTreeListBox( pParent, ResId( rResId.GetId(),*rResId.GetResMgr() ) ),
m_hdImage(ResId(IMG_HARDDISK,*rResId.GetResMgr())),
- m_hdImage_hc(ResId(IMG_HARDDISK_HC,*rResId.GetResMgr())),
m_libImage(ResId(IMG_LIB,*rResId.GetResMgr())),
- m_libImage_hc(ResId(IMG_LIB_HC,*rResId.GetResMgr())),
m_macImage(ResId(IMG_MACRO,*rResId.GetResMgr())),
- m_macImage_hc(ResId(IMG_MACRO_HC,*rResId.GetResMgr())),
m_docImage(ResId(IMG_DOCUMENT,*rResId.GetResMgr())),
- m_docImage_hc(ResId(IMG_DOCUMENT_HC,*rResId.GetResMgr())),
m_sMyMacros(String(ResId(STR_MYMACROS,*rResId.GetResMgr()))),
m_sProdMacros(String(ResId(STR_PRODMACROS,*rResId.GetResMgr())))
{
FreeResource();
SetSelectionMode( SINGLE_SELECTION );
-
+
SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL |
WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION |
WB_HASLINES | WB_HASLINESATROOT );
SetNodeDefaultImages();
-
+
nMode = 0xFF; // Alles
}
@@ -124,8 +120,8 @@ void SFTreeListBox::delUserData( SvLBoxEntry* pEntry )
{
delete pUserData;
// TBD seem to get a Select event on node that is remove ( below )
- // so need to be able to detect that this node is not to be
- // processed in order to do this, setting userData to NULL ( must
+ // so need to be able to detect that this node is not to be
+ // processed in order to do this, setting userData to NULL ( must
// be a better way to do this )
pUserData = 0;
pEntry->SetUserData( pUserData );
@@ -142,7 +138,7 @@ void SFTreeListBox::deleteTree( SvLBoxEntry* pEntry )
{
SvLBoxEntry* pNextEntry = NextSibling( pEntry );
deleteTree( pEntry );
- GetModel()->Remove( pEntry );
+ GetModel()->Remove( pEntry );
pEntry = pNextEntry;
}
}
@@ -162,7 +158,7 @@ void SFTreeListBox::deleteAllTree()
GetModel()->Remove( pEntry );
pEntry = pNextEntry;
}
- }
+ }
}
void SFTreeListBox::Init( const ::rtl::OUString& language )
@@ -176,8 +172,8 @@ void SFTreeListBox::Init( const ::rtl::OUString& language )
Sequence< Reference< browse::XBrowseNode > > children;
- ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
- ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
+ ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
+ ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
::rtl::OUString singleton = ::rtl::OUString::createFromAscii(
"/singletons/com.sun.star.script.browse.theBrowseNodeFactory" );
@@ -197,7 +193,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language )
browse::BrowseNodeFactoryViewTypes::MACROORGANIZER ) );
if ( rootNode.is() && rootNode->hasChildNodes() == sal_True )
- {
+ {
children = rootNode->getChildNodes();
}
}
@@ -207,7 +203,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language )
::rtl::OUStringToOString(
e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
// TODO exception handling
- }
+ }
Reference<XModel> xDocumentModel;
for ( sal_Int32 n = 0; n < children.getLength(); n++ )
@@ -244,7 +240,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language )
Sequence<beans::PropertyValue> moduleDescr;
try{
::rtl::OUString appModule = xModuleManager->identify( xDocumentModel );
- xModuleConfig->getByName(appModule) >>= moduleDescr;
+ xModuleConfig->getByName(appModule) >>= moduleDescr;
} catch(const uno::Exception&)
{}
@@ -264,17 +260,17 @@ void SFTreeListBox::Init( const ::rtl::OUString& language )
}
::rtl::OUString lang( language );
- Reference< browse::XBrowseNode > langEntries =
+ Reference< browse::XBrowseNode > langEntries =
getLangNodeFromRootNode( children[ n ], lang );
insertEntry( uiName, app ? IMG_HARDDISK : IMG_DOCUMENT,
- 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
+ 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
}
SetUpdateMode( TRUE );
}
-Reference< XInterface >
+Reference< XInterface >
SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName )
{
Reference< XInterface > xModel;
@@ -306,7 +302,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OU
return xModel;
}
-Reference< browse::XBrowseNode >
+Reference< browse::XBrowseNode >
SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNode, ::rtl::OUString& language )
{
Reference< browse::XBrowseNode > langNode;
@@ -320,8 +316,8 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo
{
langNode = children[ n ];
break;
- }
- }
+ }
+ }
}
catch ( Exception& )
{
@@ -348,20 +344,20 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co
{
// if we catch an exception in getChildNodes then no entries are added
}
-
+
for ( sal_Int32 n = 0; n < children.getLength(); n++ )
{
::rtl::OUString name( children[ n ]->getName() );
if ( children[ n ]->getType() != browse::BrowseNodeTypes::SCRIPT)
{
- insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model )));
+ insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model )));
}
else
{
if ( children[ n ]->getType() == browse::BrowseNodeTypes::SCRIPT )
{
- insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model )));
-
+ insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model )));
+
}
}
}
@@ -395,14 +391,9 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
Image aImage = SvFileInformationManager::GetFileImage(
INetURLObject(factoryURL), false,
BMP_COLOR_NORMAL );
- Image aHCImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false,
- BMP_COLOR_HIGHCONTRAST );
p = InsertEntry(
rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
aUserData.release()); // XXX possible leak
- SetExpandedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
- SetCollapsedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
}
else
{
@@ -415,33 +406,27 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
String const & rText, USHORT nBitmap, SvLBoxEntry * pParent,
bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData )
{
- Image aHCImage, aImage;
+ Image aImage;
if( nBitmap == IMG_HARDDISK )
{
aImage = m_hdImage;
- aHCImage = m_hdImage_hc;
- }
+ }
else if( nBitmap == IMG_LIB )
{
aImage = m_libImage;
- aHCImage = m_libImage_hc;
}
else if( nBitmap == IMG_MACRO )
{
aImage = m_macImage;
- aHCImage = m_macImage_hc;
}
else if( nBitmap == IMG_DOCUMENT )
{
aImage = m_docImage;
- aHCImage = m_docImage_hc;
}
SvLBoxEntry * p = InsertEntry(
rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
aUserData.release()); // XXX possible leak
- SetExpandedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
- SetCollapsedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
- return p;
+ return p;
}
void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
@@ -459,7 +444,7 @@ void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
{
node = userData->GetNode();
model = userData->GetModel();
- RequestSubEntries( pEntry, node, model );
+ RequestSubEntries( pEntry, node, model );
userData->setLoaded();
}
}
@@ -552,7 +537,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString languag
m_createDupStr( CUI_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ),
m_createErrTitleStr( CUI_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ),
m_renameErrStr( CUI_RES ( RID_SVXSTR_RENAMEFAILED ) ),
- m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) )
+ m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) )
{
// must be a neater way to deal with the strings than as above
@@ -591,22 +576,22 @@ short SvxScriptOrgDialog::Execute()
SfxObjectShell *pDoc = SfxObjectShell::GetFirst();
- // force load of MSPs for all documents
- while ( pDoc )
+ // force load of MSPs for all documents
+ while ( pDoc )
{
- Reference< provider::XScriptProviderSupplier > xSPS =
+ Reference< provider::XScriptProviderSupplier > xSPS =
Reference< provider::XScriptProviderSupplier >
( pDoc->GetModel(), UNO_QUERY );
if ( xSPS.is() )
{
- Reference< provider::XScriptProvider > ScriptProvider =
+ Reference< provider::XScriptProvider > ScriptProvider =
xSPS->getScriptProvider();
}
-
+
pDoc = SfxObjectShell::GetNext(*pDoc);
}
aScriptsBox.ExpandAllTrees();
-
+
Window* pPrevDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
short nRet = ModalDialog::Execute();
@@ -624,20 +609,20 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
{
if ( node->getType() == browse::BrowseNodeTypes::SCRIPT)
{
- aRunButton.Enable();
+ aRunButton.Enable();
}
else
{
- aRunButton.Disable();
+ aRunButton.Disable();
}
Reference< beans::XPropertySet > xProps( node, UNO_QUERY );
-
+
if ( !xProps.is() )
{
aEditButton.Disable();
aDelButton.Disable();
aCreateButton.Disable();
- aRunButton.Disable();
+ aRunButton.Disable();
return;
}
@@ -685,14 +670,14 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
{
aRenameButton.Disable();
}
- }
+ }
else
{
// no node info available, disable all configurable actions
aDelButton.Disable();
aCreateButton.Disable();
aEditButton.Disable();
- aRunButton.Disable();
+ aRunButton.Disable();
aRenameButton.Disable();
}
}
@@ -726,7 +711,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
node = userData->GetNode();
CheckButtons( node );
}
-
+
return 0;
}
@@ -737,7 +722,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
StoreCurrentSelection();
EndDialog( 0 );
}
- if ( pButton == &aEditButton ||
+ if ( pButton == &aEditButton ||
pButton == &aCreateButton ||
pButton == &aDelButton ||
pButton == &aRunButton ||
@@ -765,7 +750,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
{
return 0;
}
-
+
if ( pButton == &aRunButton )
{
::rtl::OUString tmpString;
@@ -874,7 +859,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
renameEntry( pEntry );
}
}
- }
+ }
}
return 0;
}
@@ -884,7 +869,7 @@ Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvLBoxEntry*
Reference< browse::XBrowseNode > node;
if ( pEntry )
{
- SFEntry* userData = (SFEntry*)pEntry->GetUserData();
+ SFEntry* userData = (SFEntry*)pEntry->GetUserData();
if ( userData )
{
node = userData->GetNode();
@@ -899,7 +884,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry )
Reference< XModel > model;
if ( pEntry )
{
- SFEntry* userData = (SFEntry*)pEntry->GetUserData();
+ SFEntry* userData = (SFEntry*)pEntry->GetUserData();
if ( userData )
{
model = userData->GetModel();
@@ -909,7 +894,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry )
return model;
}
-Reference< XInterface >
+Reference< XInterface >
SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName )
{
Reference< XInterface > xModel;
@@ -947,13 +932,13 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
Reference< browse::XBrowseNode > aChildNode;
Reference< browse::XBrowseNode > node = getBrowseNode( pEntry );
Reference< script::XInvocation > xInv( node, UNO_QUERY );
-
+
if ( xInv.is() )
{
::rtl::OUString aNewName;
::rtl::OUString aNewStdName;
USHORT nMode = INPUTMODE_NEWLIB;
- if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 )
+ if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 )
{
aNewStdName = ::rtl::OUString::createFromAscii( "Library" ) ;
}
@@ -966,7 +951,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
//String aNewStdName( ResId( STR_STDMODULENAME ) );
BOOL bValid = FALSE;
USHORT i = 1;
-
+
Sequence< Reference< browse::XBrowseNode > > childNodes;
// no children => ok to create Parcel1 or Script1 without checking
try
@@ -1074,20 +1059,20 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
::rtl::OUStringToOString(
e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer );
}
- }
+ }
if ( aChildNode.is() )
{
String aChildName = aChildNode->getName();
SvLBoxEntry* pNewEntry = NULL;
-
+
::rtl::OUString name( aChildName );
Reference<XModel> xDocumentModel = getModel( pEntry );
// ISSUE do we need to remove all entries for parent
// to achieve sort? Just need to determine position
// SvTreeListBox::InsertEntry can take position arg
- // -- Basic doesn't do this on create.
+ // -- Basic doesn't do this on create.
// Suppose we could avoid this too. -> created nodes are
// not in alphabetical order
if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT )
@@ -1182,7 +1167,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
::rtl::OUStringToOString(
e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer );
}
- }
+ }
if ( aChildNode.is() )
{
aScriptsBox.SetEntryText( pEntry, aChildNode->getName() );
@@ -1231,12 +1216,12 @@ void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry )
::rtl::OUStringToOString(
e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer );
}
- }
-
+ }
+
if ( result == sal_True )
{
aScriptsBox.deleteTree( pEntry );
- aScriptsBox.GetModel()->Remove( pEntry );
+ aScriptsBox.GetModel()->Remove( pEntry );
}
else
{
@@ -1344,11 +1329,11 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
aScriptsBox.SetCurEntry( pEntry );
}
-BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1,
+BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1,
Reference< browse::XBrowseNode > node2 )
{
- ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
- ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
+ ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
+ ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
if( node1->getName().equals( userStr ) )
return true;
if( node2->getName().equals( userStr ) )
@@ -1360,7 +1345,7 @@ BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1,
return dialogSort2( node1, node2 );
}
-BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
+BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
Reference< browse::XBrowseNode > node2 )
{
return ( node1->getName().compareTo( node2->getName() ) < 0 );
@@ -1372,7 +1357,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
const ::rtl::OUString& value )
{
sal_Int32 pos = source.indexOf( token );
-
+
if ( pos != -1 && value.getLength() != 0 )
{
return source.replaceAt( pos, token.getLength(), value );
@@ -1427,7 +1412,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
::rtl::OUString language = unknown;
::rtl::OUString script = unknown;
- ::rtl::OUString line = unknown;
+ ::rtl::OUString line = unknown;
::rtl::OUString type = ::rtl::OUString();
::rtl::OUString message = eScriptError.Message;
@@ -1473,7 +1458,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
::rtl::OUString line = unknown;
::rtl::OUString type = unknown;
::rtl::OUString message = eScriptException.Message;
-
+
if ( eScriptException.language.getLength() != 0 )
{
language = eScriptException.language;
@@ -1515,10 +1500,10 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
::rtl::OUString unformatted = String(
CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) );
- ::rtl::OUString language =
+ ::rtl::OUString language =
::rtl::OUString::createFromAscii( "UNKNOWN" );
- ::rtl::OUString script =
+ ::rtl::OUString script =
::rtl::OUString::createFromAscii( "UNKNOWN" );
::rtl::OUString message;
@@ -1537,10 +1522,10 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
CUI_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
message = ReplaceString(
message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language );
-
+
}
else
- {
+ {
message = sError.Message;
}
return FormatErrorString(
@@ -1568,7 +1553,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
::rtl::OUString GetErrorMessage( const com::sun::star::uno::Any& aException )
{
::rtl::OUString exType;
- if ( aException.getValueType() ==
+ if ( aException.getValueType() ==
::getCppuType( (const reflection::InvocationTargetException* ) NULL ) )
{
reflection::InvocationTargetException ite;
@@ -1587,12 +1572,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
ite.TargetException >>= scriptException;
return GetErrorMessage( scriptException );
}
- else
+ else
{
// Unknown error, shouldn't happen
// OSL_ASSERT(...)
}
-
+
}
else if ( aException.getValueType() == ::getCppuType( ( const provider::ScriptFrameworkErrorException* ) NULL ) )
{
@@ -1600,7 +1585,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
provider::ScriptFrameworkErrorException sfe;
aException >>= sfe;
return GetErrorMessage( sfe );
-
+
}
// unknown exception
Exception e;
@@ -1610,9 +1595,9 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
return GetErrorMessage( rte );
}
- aException >>= e;
+ aException >>= e;
return GetErrorMessage( e );
-
+
}
SvxScriptErrorDialog::SvxScriptErrorDialog(
diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
index 3fb0118..5b217bb 100644
--- a/cui/source/dialogs/scriptdlg.hrc
+++ b/cui/source/dialogs/scriptdlg.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,13 +43,9 @@
#define SF_PB_HELP 9
#define IMG_HARDDISK 1
-#define IMG_HARDDISK_HC 2
#define IMG_LIB 3
-#define IMG_LIB_HC 4
#define IMG_MACRO 5
-#define IMG_MACRO_HC 6
#define IMG_DOCUMENT 7
-#define IMG_DOCUMENT_HC 8
#define RID_IMGLST_OBJECTS ( RID_BASICIDE_START + 7 )
#define RID_IMGLST_OBJECTS_HC (RID_BASICIDE_START + 13)
@@ -67,9 +63,9 @@
#define STR_RENAME 19
// Others
-/*
+/*
Please be aware that these strings are global resources, don't use self-defined values!
-You have to use the RID_SVXSTART macro do avoid ID clashes with other resource files. Sfx2 delivers
+You have to use the RID_SVXSTART macro do avoid ID clashes with other resource files. Sfx2 delivers
some of its own resource files to svx - where they are added to svx resource file!!
*/
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index 292c862..5a551ce 100644
--- a/cui/source/dialogs/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.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
@@ -59,41 +59,21 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
MASKCOLOR
};
- Image IMG_HARDDISK_HC
- {
- ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
- MASKCOLOR
- };
Image IMG_LIB
{
ImageBitmap = Bitmap { File = "im30820.png"; };
MASKCOLOR
};
- Image IMG_LIB_HC
- {
- ImageBitmap = Bitmap { File = "imh30820.png"; };
- MASKCOLOR
- };
Image IMG_MACRO
{
ImageBitmap = Bitmap { File = "im30821.png"; };
MASKCOLOR
};
- Image IMG_MACRO_HC
- {
- ImageBitmap = Bitmap { File = "imh30821.png"; };
- MASKCOLOR
- };
Image IMG_DOCUMENT
{
ImageBitmap = Bitmap { File = "im30826.png"; };
MASKCOLOR
};
- Image IMG_DOCUMENT_HC
- {
- ImageBitmap = Bitmap { File = "imh30826.png"; };
- MASKCOLOR
- };
String STR_MYMACROS
{
Text [ en-US ] = "My Macros";
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 2be437f..eee80a6 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.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
@@ -61,24 +61,20 @@
#define INPUTMODE_NEWMACRO 2
#define INPUTMODE_RENAME 3
-typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString ,
+typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString ,
::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Selection_hash;
class SFEntry;
class SFTreeListBox : public SvTreeListBox
{
- friend class SvxScriptOrgDialog;
+ friend class SvxScriptOrgDialog;
private:
USHORT nMode;
Image m_hdImage;
- Image m_hdImage_hc;
Image m_libImage;
- Image m_libImage_hc;
Image m_macImage;
- Image m_macImage_hc;
Image m_docImage;
- Image m_docImage_hc;
::rtl::OUString m_sMyMacros;
::rtl::OUString m_sProdMacros;
@@ -94,14 +90,14 @@ protected:
virtual void ExpandedHdl();
SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType );
virtual long ExpandingHdl();
- static BOOL dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
+ static BOOL dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
- static BOOL dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
+ static BOOL dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
public:
void Init( const ::rtl::OUString& language );
- void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
+ void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model );
SFTreeListBox( Window* pParent, const ResId& rRes );
~SFTreeListBox();
@@ -115,7 +111,7 @@ public:
SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
SvLBoxEntry * pParent,
bool bChildrenOnDemand,
- std::auto_ptr< SFEntry > aUserData,
+ std::auto_ptr< SFEntry > aUserData,
::rtl::OUString factoryURL );
SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
SvLBoxEntry * pParent,
@@ -146,13 +142,13 @@ class SFEntry
private:
BYTE nType;
bool loaded;
- ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model;
+ ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model;
SFEntry(){}
public:
SFEntry( BYTE nT ) { nType = nT; loaded=false; }
- SFEntry( BYTE nT,
- const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes ,
+ SFEntry( BYTE nT,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes ,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; }
virtual ~SFEntry() {}
@@ -196,14 +192,14 @@ protected:
DECL_LINK( ButtonHdl, Button * );
BOOL getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node );
-
+
::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 );
-
+
void createEntry( SvLBoxEntry* pEntry );
void renameEntry( SvLBoxEntry* pEntry );
void deleteEntry( SvLBoxEntry* pEntry );
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
- getBrowseNode( SvLBoxEntry* pEntry );
+ getBrowseNode( SvLBoxEntry* pEntry );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry );
void EnableButton( Button& rButton, BOOL bEnable );
String getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth );
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 8b6b8f6..b829daf 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.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
@@ -31,7 +31,7 @@
// include ---------------------------------------------------------------
-#include <svx/svxdlg.hxx>
+#include <svx/svxdlg.hxx>
#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/filedlghelper.hxx>
@@ -355,8 +355,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& )
SvLBoxEntry* pEntry = pPathBox->InsertEntry( aStr );
if ( bReadOnly )
{
- pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage, BMP_COLOR_NORMAL );
- pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImageHC, BMP_COLOR_HIGHCONTRAST );
+ pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage );
}
PathUserData_Impl* pPathImpl = new PathUserData_Impl(i);
pPathImpl->sUserPath = sUser;
More information about the Libreoffice-commits
mailing list