[Libreoffice-commits] .: 4 commits - framework/inc framework/Library_fwk.mk framework/source qadevOOo/tests registry/source sc/source svtools/inc svtools/source sw/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Sep 23 01:02:48 PDT 2011
framework/Library_fwk.mk | 1
framework/inc/classes/fwktabwindow.hxx | 1
framework/inc/classes/protocolhandlercache.hxx | 1
framework/inc/classes/rootactiontriggercontainer.hxx | 2
framework/inc/dispatch/menudispatcher.hxx | 2
framework/inc/uielement/addonstoolbarmanager.hxx | 1
framework/inc/uielement/constitemcontainer.hxx | 1
framework/inc/uielement/itemcontainer.hxx | 1
framework/inc/uielement/rootitemcontainer.hxx | 1
framework/inc/uielement/toolbarmanager.hxx | 1
framework/inc/xml/menudocumenthandler.hxx | 2
framework/source/classes/fwktabwindow.cxx | 7
framework/source/dispatch/menudispatcher.cxx | 27 ---
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 19 --
framework/source/fwe/xml/menudocumenthandler.cxx | 5
framework/source/fwi/classes/protocolhandlercache.cxx | 13 -
framework/source/fwi/uielement/constitemcontainer.cxx | 13 -
framework/source/fwi/uielement/itemcontainer.cxx | 9 -
framework/source/fwi/uielement/rootitemcontainer.cxx | 10 -
framework/source/layoutmanager/panel.cxx | 87 -----------
framework/source/layoutmanager/panel.hxx | 88 ------------
framework/source/uielement/addonstoolbarmanager.cxx | 5
framework/source/uielement/toolbarmanager.cxx | 5
qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java | 30 ++--
registry/source/regimpl.cxx | 4
sc/source/filter/html/htmlexp.cxx | 12 -
svtools/inc/svtools/htmlout.hxx | 4
svtools/source/svhtml/htmlout.cxx | 16 +-
sw/source/filter/html/wrthtml.cxx | 7
unusedcode.easy | 11 -
30 files changed, 35 insertions(+), 351 deletions(-)
New commits:
commit 2536f92c61069531a179624ff2d70603995127e6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 23 00:55:35 2011 +0100
handle --enable-gio as well as --enable-gnome-vfs
Both of these providers will attempt to claim to be able to handle all
internally-unhandled protocols in order to forward them to their system
backends, so there will be a preexisting protocol handler for any random
protocol (rather than none) in those cases.
extends e07ac6765dbaec78e77c694148f5531072036dc8 (#i117381#)
diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
index de2ea00..7de56a9 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
@@ -70,8 +70,17 @@ public class _XContentProviderManager extends MultiMethodTest {
static final String myScheme = "test-scheme";
/**
+ * Any preexisting content provider. If it exists it will be hidden by
+ * <code>firstContentProvider</code>, registered with the same
+ * <code>myScheme</code>. Typically there is no preexisting content
+ * provider, unless the catch-all providers GnomeVFSContentProvider or
+ * GIOContentProvider is installed
+ */
+ XContentProvider preexistingContentProvider;
+
+ /**
* First content provider. It will be hidden by <code>contentProvider
- * </code>, registred with the same <code>myScheme</code> to test
+ * </code>, registered with the same <code>myScheme</code> to test
* the "hiding" behaviour.
*/
XContentProvider firstContentProvider;
@@ -135,6 +144,9 @@ public class _XContentProviderManager extends MultiMethodTest {
// querying providfers info before inserting them, to verify results
initialProvidersInfo = oObj.queryContentProviders();
+ // GnomeVFSContentProvider or GIOContentProvider ?, typically null
+ preexistingContentProvider = oObj.queryContentProvider(myScheme);
+
log.println("registering the first provider");
try {
oObj.registerContentProvider(firstContentProvider, myScheme,false);
@@ -273,19 +285,7 @@ public class _XContentProviderManager extends MultiMethodTest {
res = oObj.queryContentProvider(myScheme);
- // verifying that no provider is returned (if the
- // GnomeVFSContentProvider is installed, it will handle all otherwise
- // unhandled schemes, so we have to ignore it here):
- if (res != null) {
- XServiceInfo info = UnoRuntime.queryInterface(
- XServiceInfo.class, res);
- if (info != null
- && info.supportsService(
- "com.sun.star.ucb.GnomeVFSContentProvider"))
- {
- res = null;
- }
- }
- tRes.tested("deregisterContentProvider()", res == null);
+ // verifying that the original provider (typically none) is returned.
+ tRes.tested("deregisterContentProvider()", res == preexistingContentProvider);
}
}
commit fee307d452753efbcb3d450e6a5dcd945ba41463
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 22 23:43:19 2011 +0100
deugly HTMLOutFuncs::ConvertStringToHTML
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 1aa0ce3..84c734e 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1136,9 +1136,8 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
xub_StrLen nFonts = rFontItem.GetFamilyName().GetTokenCount( ';' );
if ( nFonts == 1 )
{
- ByteString aTmpStr;
- HTMLOutFuncs::ConvertStringToHTML( rFontItem.GetFamilyName(),
- aTmpStr, eDestEnc, &aNonConvertibleChars );
+ rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML(
+ rFontItem.GetFamilyName(), eDestEnc, &aNonConvertibleChars);
aStr.append(aTmpStr);
}
else
@@ -1146,10 +1145,9 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
const String& rList = rFontItem.GetFamilyName();
for ( xub_StrLen j = 0, nPos = 0; j < nFonts; j++ )
{
- ByteString aTmpStr;
- HTMLOutFuncs::ConvertStringToHTML(
- rList.GetToken( 0, ';', nPos ), aTmpStr, eDestEnc,
- &aNonConvertibleChars );
+ rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML(
+ rList.GetToken( 0, ';', nPos ), eDestEnc,
+ &aNonConvertibleChars);
aStr.append(aTmpStr);
if ( j < nFonts-1 )
aStr.append(',');
diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx
index e009962..588e665 100644
--- a/svtools/inc/svtools/htmlout.hxx
+++ b/svtools/inc/svtools/htmlout.hxx
@@ -68,9 +68,9 @@ struct HTMLOutFuncs
static const sal_Char sNewLine[]; // \015\012
#endif
- SVT_DLLPUBLIC static void ConvertStringToHTML( const String& sSrc, ByteString& rDest,
+ SVT_DLLPUBLIC static rtl::OString ConvertStringToHTML( const String& sSrc,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
- String *pNonConvertableChars = 0);
+ String *pNonConvertableChars = 0 );
SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr,
sal_Bool bOn = sal_True,
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 25fd6df..da7ff07 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -515,16 +515,16 @@ rtl::OString lcl_FlushToAscii( HTMLOutContext& rContext )
return aDest.makeStringAndClear();
}
-void HTMLOutFuncs::ConvertStringToHTML( const String& rSrc,
- ByteString& rDest,
- rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars )
+rtl::OString HTMLOutFuncs::ConvertStringToHTML( const String& rSrc,
+ rtl_TextEncoding eDestEnc, String *pNonConvertableChars )
{
HTMLOutContext aContext( eDestEnc );
+ rtl::OStringBuffer aDest;
for( sal_uInt32 i=0UL, nLen = rSrc.Len(); i < nLen; i++ )
- rDest += ByteString(lcl_ConvertCharToHTML(
+ aDest.append(lcl_ConvertCharToHTML(
rSrc.GetChar( (xub_StrLen)i ), aContext, pNonConvertableChars));
- rDest += ByteString(lcl_FlushToAscii( aContext ));
+ aDest.append(lcl_FlushToAscii(aContext));
+ return aDest.makeStringAndClear();
}
SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, const sal_Char *pStr,
@@ -972,12 +972,12 @@ rtl::OString HTMLOutFuncs::CreateTableDataOptionsValNum(
append(';'); // Language fuer Format 0
if ( nFormat )
{
- ByteString aNumStr;
+ rtl::OString aNumStr;
LanguageType nLang;
const SvNumberformat* pFormatEntry = rFormatter.GetEntry( nFormat );
if ( pFormatEntry )
{
- ConvertStringToHTML( pFormatEntry->GetFormatstring(), aNumStr,
+ aNumStr = ConvertStringToHTML( pFormatEntry->GetFormatstring(),
eDestEnc, pNonConvertableChars );
nLang = pFormatEntry->GetLanguage();
}
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 9817e8f..4a7cd31 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -300,10 +300,9 @@ sal_uLong SwHTMLWriter::WriteStream()
"Export gelinkter Bereiche am Dok-Anfang ist nicht implemntiert" );
// nur das Tag fuer die Section merken
- ByteString aName;
- HTMLOutFuncs::ConvertStringToHTML(
- pSNd->GetSection().GetSectionName(),
- aName, eDestEnc, &aNonConvertableCharacters );
+ rtl::OString aName = HTMLOutFuncs::ConvertStringToHTML(
+ pSNd->GetSection().GetSectionName(), eDestEnc,
+ &aNonConvertableCharacters );
rtl::OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
commit 17b8373171e52e6ce4c5ecf5074082f76cb36118
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 22 22:58:16 2011 +0100
callcatcher: various unused methods
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 8dacdda..abb96ce 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -113,7 +113,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/jobs/joburl \
framework/source/layoutmanager/helpers \
framework/source/layoutmanager/layoutmanager \
- framework/source/layoutmanager/panel \
framework/source/layoutmanager/toolbarlayoutmanager \
framework/source/layoutmanager/uielement \
framework/source/loadenv/loadenv \
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 9ddbe9b..d1c7cad 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -116,7 +116,6 @@ private:
DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
- DECL_DLLPRIVATE_LINK( CloseHdl, PushButton * );
public:
FwkTabWindow( Window* pParent );
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 52a53a9..79f4cdc 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -157,7 +157,6 @@ class FWI_DLLPUBLIC HandlerCache
sal_Bool search( const ::rtl::OUString& sURL, ProtocolHandler* pReturn ) const;
sal_Bool search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const;
- sal_Bool exists( const ::rtl::OUString& sURL ) const;
void takeOver(HandlerHash* pHandler, PatternHash* pPattern);
};
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 89b48fc..924d359 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -55,8 +55,6 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
virtual ~RootActionTriggerContainer();
- const Menu* GetMenu();
-
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index a43800a..8d22bff 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -255,8 +255,6 @@ class MenuDispatcher : // interfaces
private:
- DECL_LINK( Close_Impl, void* );
-
/*-****************************************************************************************************//**
@short -
@descr -
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 5b71fe1..883e0d7 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -85,7 +85,6 @@ class AddonsToolBarManager : public ToolBarManager
DECL_LINK( DoubleClick, ToolBox * );
DECL_LINK( Command, CommandEvent * );
DECL_LINK( Select, ToolBox * );
- DECL_LINK( Highlight, ToolBox * );
DECL_LINK( Activate, ToolBox * );
DECL_LINK( Deactivate, ToolBox * );
DECL_LINK( StateChanged, StateChangedType* );
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index 36e29d5..6dc42f4 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -77,7 +77,6 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::com::sun::star::lang::XType
public:
ConstItemContainer();
ConstItemContainer( const ItemContainer& rtemContainer );
- ConstItemContainer( const RootItemContainer& rRootItemContainer, sal_Bool bFastCopy = sal_False );
ConstItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSourceContainer, sal_Bool bFastCopy = sal_False );
virtual ~ConstItemContainer();
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 56780f4..159d6a5 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -74,7 +74,6 @@ class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper1< ::com::sun
// XUnoTunnel
static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw();
static ItemContainer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
- sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
// XIndexContainer
virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 92677b9..43ee41c 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -76,7 +76,6 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider
public:
FWI_DLLPUBLIC RootItemContainer();
- FWI_DLLPUBLIC RootItemContainer( const ConstItemContainer& rConstItemContainer );
FWI_DLLPUBLIC RootItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer );
virtual FWI_DLLPUBLIC ~RootItemContainer();
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index e34913d..2f8ad05 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -169,7 +169,6 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
DECL_LINK( DropdownClick, ToolBox * );
DECL_LINK( DoubleClick, ToolBox * );
DECL_LINK( Select, ToolBox * );
- DECL_LINK( Highlight, ToolBox * );
DECL_LINK( Activate, ToolBox * );
DECL_LINK( Deactivate, ToolBox * );
DECL_LINK( StateChanged, StateChangedType* );
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 3c899ed..c6b6765 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -169,8 +169,6 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory );
virtual ~OReadMenuBarHandler();
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
-
// XDocumentHandler
virtual void SAL_CALL startDocument(void)
throw ( ::com::sun::star::xml::sax::SAXException,
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 3c3cd7d..f9f15a2 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -319,13 +319,6 @@ IMPL_LINK( FwkTabWindow, DeactivatePageHdl, TabControl *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK( FwkTabWindow, CloseHdl, PushButton *, EMPTYARG )
-{
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
void FwkTabWindow::AddEventListener( const Link& rEventListener )
{
m_aTabCtrl.AddEventListener( rEventListener );
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index ce8f9c3..8fcd6cc 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -368,33 +368,6 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR
return sal_False;
}
-IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG )
-{
- css::uno::Reference < css::frame::XFrame > xFrame( m_xOwnerWeak.get(), css::uno::UNO_QUERY );
- if ( !xFrame.is() )
- return 0;
-
- css::util::URL aURL;
- aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
- css::uno::Reference< css::util::XURLTransformer > xTrans ( m_xFactory->createInstance(
- SERVICENAME_URLTRANSFORMER ), css::uno::UNO_QUERY );
- if( xTrans.is() )
- {
- // Datei laden
- xTrans->parseStrict( aURL );
- uno::Reference< XDispatchProvider > xProv( xFrame, UNO_QUERY );
- if ( xProv.is() )
- {
- css::uno::Reference < css::frame::XDispatch > aDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 );
- if ( aDisp.is() )
- aDisp->dispatch( aURL, css::uno::Sequence < css::beans::PropertyValue>() );
- }
- }
-
- return 0;
-}
-
-
//_________________________________________________________________________________________________________________
// debug methods
//_________________________________________________________________________________________________________________
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 9f6fe91..0d2f125 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -72,25 +72,6 @@ RootActionTriggerContainer::~RootActionTriggerContainer()
{
}
-const Menu* RootActionTriggerContainer::GetMenu()
-{
- if ( !m_bContainerChanged )
- return m_pMenu;
- else
- {
- ResetableGuard aGuard( m_aLock );
-
- Menu* pNewMenu = new PopupMenu;
-
- ActionTriggerHelper::CreateMenuFromActionTriggerContainer( pNewMenu, this );
- m_pMenu = pNewMenu;
- m_bContainerChanged = sal_False;
-
- return m_pMenu;
- }
-}
-
-
// XInterface
Any SAL_CALL RootActionTriggerContainer::queryInterface( const Type& aType )
throw ( RuntimeException )
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index bb36e40..0695698 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -345,11 +345,6 @@ OReadMenuBarHandler::OReadMenuBarHandler(
}
-const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuBarHandler::getServiceFactory()
-{
- return mxServiceFactory;
-}
-
OReadMenuBarHandler::~OReadMenuBarHandler()
{
}
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index 1a7ddf2..b6fc7e8 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -215,19 +215,6 @@ sal_Bool HandlerCache::search( const css::util::URL& aURL, ProtocolHandler* pRet
}
//_________________________________________________________________________________________________________________
-
-sal_Bool HandlerCache::exists( const ::rtl::OUString& sURL ) const
-{
- sal_Bool bFound = sal_False;
- /* SAFE */{
- ReadGuard aReadLock( LockHelper::getGlobalLock() );
- PatternHash::const_iterator pItem = m_pPattern->findPatternKey(sURL);
- bFound = pItem!=m_pPattern->end();
- /* SAFE */}
- return bFound;
-}
-
-//_________________________________________________________________________________________________________________
void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern)
{
// SAFE ->
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 285a7fe..452f353 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -151,19 +151,6 @@ ConstItemContainer::ConstItemContainer() : ::cppu::OWeakObject()
{
}
-ConstItemContainer::ConstItemContainer( const RootItemContainer& rRootItemContainer, sal_Bool bFastCopy )
-{
- ShareGuard( rRootItemContainer.m_aShareMutex );
-
- // If bFastCopy is set the onwer of the root item container will transfer ownership to us. So
- // it is possible to copy only the root part.
- m_aUIName = rRootItemContainer.m_aUIName;
- if ( bFastCopy )
- m_aItemVector = rRootItemContainer.m_aItemVector;
- else
- copyItemContainer( rRootItemContainer.m_aItemVector );
-}
-
ConstItemContainer::ConstItemContainer( const ItemContainer& rItemContainer )
{
ShareGuard( rItemContainer.m_aShareMutex );
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 42dc8c2..78d5f1b 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -151,15 +151,6 @@ Reference< XIndexAccess > ItemContainer::deepCopyContainer( const Reference< XIn
return xReturn;
}
-// XUnoTunnel
-sal_Int64 ItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException)
-{
- if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( ItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) )
- return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ));
-
- return 0;
-}
-
namespace
{
class theItemContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theItemContainerUnoTunnelId > {};
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index b00a618..f4729a9 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -95,16 +95,6 @@ RootItemContainer::RootItemContainer()
{
}
-RootItemContainer::RootItemContainer( const ConstItemContainer& rConstItemContainer )
- : ThreadHelpBase ( )
- , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() )
- , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
- , ::cppu::OWeakObject()
-{
- m_aUIName = rConstItemContainer.m_aUIName;
- copyItemContainer( rConstItemContainer.m_aItemVector );
-}
-
RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceContainer )
: ThreadHelpBase ( )
, ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() )
diff --git a/framework/source/layoutmanager/panel.cxx b/framework/source/layoutmanager/panel.cxx
deleted file mode 100644
index 969e240..0000000
--- a/framework/source/layoutmanager/panel.cxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-//_________________________________________________________________________________________________________________
-// my own includes
-//_________________________________________________________________________________________________________________
-
-#include "panel.hxx"
-#include "helpers.hxx"
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
-
-#include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
-
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
-
-using namespace ::com::sun::star;
-
-namespace framework
-{
-
-Panel::Panel(
- const uno::Reference< lang::XMultiServiceFactory >& rSMGR,
- const uno::Reference< awt::XWindow >& rParent,
- PanelPosition nPanel ) :
- m_xSMGR(rSMGR), m_nPanelPosition(nPanel)
-{
- uno::Reference< awt::XWindowPeer > xWindowPeer( rParent, uno::UNO_QUERY );
- m_xPanelWindow = uno::Reference< awt::XWindow >( createToolkitWindow( rSMGR, xWindowPeer, "splitwindow" ), uno::UNO_QUERY );
-
- SolarMutexGuard aGuard;
- SplitWindow* pSplitWindow = dynamic_cast< SplitWindow* >( VCLUnoHelper::GetWindow( m_xPanelWindow ));
-
- if ( pSplitWindow )
- {
- // Set alignment
- if (nPanel == PANEL_TOP)
- pSplitWindow->SetAlign( WINDOWALIGN_TOP );
- else if (nPanel == PANEL_BOTTOM)
- pSplitWindow->SetAlign( WINDOWALIGN_BOTTOM );
- else if (nPanel == PANEL_LEFT)
- pSplitWindow->SetAlign( WINDOWALIGN_LEFT );
- else
- pSplitWindow->SetAlign( WINDOWALIGN_RIGHT );
- }
-}
-
-Panel::~Panel()
-{
-}
-
-} // namespace framework
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/panel.hxx b/framework/source/layoutmanager/panel.hxx
deleted file mode 100644
index 34fb612..0000000
--- a/framework/source/layoutmanager/panel.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_LAYOUTMANAGER_PANEL_HXX_
-#define __FRAMEWORK_LAYOUTMANAGER_PANEL_HXX_
-
-//_________________________________________________________________________________________________________________
-// my own includes
-//_________________________________________________________________________________________________________________
-
-#include <macros/generic.hxx>
-#include <stdtypes.h>
-#include <properties.h>
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
-
-#include <vcl/window.hxx>
-#include <vcl/splitwin.hxx>
-
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework
-{
-
-enum PanelPosition
-{
- PANEL_TOP,
- PANEL_LEFT,
- PANEL_RIGHT,
- PANEL_BOTTOM,
- PANEL_COUNT
-};
-
-class Panel
-{
- public:
- Panel( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMGR,
- const css::uno::Reference< css::awt::XWindow >& rParent,
- PanelPosition nPanel );
- virtual ~Panel();
-
- private:
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
- css::uno::Reference< css::awt::XWindow > m_xPanelWindow;
- PanelPosition m_nPanelPosition;
-};
-
-}
-
-#endif // __FRAMEWORK_LAYOUTMANAGER_PANEL_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index a8c9884..dfbc197 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -488,11 +488,6 @@ IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG )
return 1;
}
-IMPL_LINK( AddonsToolBarManager, Highlight, ToolBox*, EMPTYARG )
-{
- return 1;
-}
-
IMPL_LINK( AddonsToolBarManager, Activate, ToolBox*, EMPTYARG )
{
return 1;
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index bc02e01..f73dbd9 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -2075,11 +2075,6 @@ IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG )
return 1;
}
-IMPL_LINK( ToolBarManager, Highlight, ToolBox*, EMPTYARG )
-{
- return 1;
-}
-
IMPL_LINK( ToolBarManager, Activate, ToolBox*, EMPTYARG )
{
return 1;
diff --git a/unusedcode.easy b/unusedcode.easy
index bc6b1b9..b3c1275 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2258,21 +2258,10 @@ formula::FormulaTokenIterator::First()
formula::ResourceManager::loadString(unsigned short, char const*, rtl::OUString const&)
formula::StructPage::GetSelectedEntryText()
formula::StructPage::GetSelectedToken()
-framework::AddonsToolBarManager::LinkStubHighlight(void*, void*)
-framework::ConstItemContainer::ConstItemContainer(framework::RootItemContainer const&, unsigned char)
-framework::FwkTabWindow::LinkStubCloseHdl(void*, void*)
-framework::HandlerCache::exists(rtl::OUString const&) const
-framework::ItemContainer::getSomething(com::sun::star::uno::Sequence<signed char> const&)
-framework::MenuDispatcher::LinkStubClose_Impl(void*, void*)
-framework::OReadMenuBarHandler::getServiceFactory()
-framework::Panel::Panel(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, framework::PanelPosition)
framework::PanelWindow::PanelWindow(Window*, long)
-framework::RootActionTriggerContainer::GetMenu()
-framework::RootItemContainer::RootItemContainer(framework::ConstItemContainer const&)
framework::ShareableMutex::getShareableOslMutex()
framework::StatusBarDescriptor::DeleteAndDestroy(unsigned short, unsigned short)
framework::TabWindow::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-framework::ToolBarManager::LinkStubHighlight(void*, void*)
framework::UIConfigElementWrapperBase::dispose()
framework::UIElementWrapperBase::dispose()
graphite2::Segment::append(graphite2::Segment const&)
commit 8b56cbf38f086653713a7fdeafe83126d1786b93
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 22 22:30:06 2011 +0100
tidy indent
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 3f709be..987b679 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -744,9 +744,9 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName,
break;
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ORegKey > p(new ORegKey(path, this));
-SAL_WNODEPRECATED_DECLARATIONS_POP
+ SAL_WNODEPRECATED_DECLARATIONS_POP
i = m_openKeyTable.insert(std::make_pair(path, p.get())).first;
p.release();
} else {
More information about the Libreoffice-commits
mailing list