[Libreoffice-commits] .: 2 commits - curl/makefile.mk curl/prj sfx2/source svl/inc svl/source unusedcode.easy

[Caolán McNamara]

 curl/makefile.mk              |    2 ++
 curl/prj/d.lst                |    4 +++-
 sfx2/source/dialog/tabdlg.cxx |   16 ----------------
 svl/inc/svl/style.hxx         |    1 -
 svl/source/items/style.cxx    |   19 -------------------
 unusedcode.easy               |    2 ++
 6 files changed, 7 insertions(+), 37 deletions(-)

New commits:
commit 9efb60f39fbd96cf3c0de5938fb8b00086f76bbc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 3 09:36:27 2011 +0100

    callcatcher: update list

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 738041f..57e6013 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -144,7 +144,6 @@ public:
 
                     ~SfxTabDialogController();
 
-    DECL_LINK(      Execute_Impl, void* );
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 };
 
@@ -153,21 +152,6 @@ SfxTabDialogController::~SfxTabDialogController()
     delete pSet;
 }
 
-IMPL_LINK( SfxTabDialogController, Execute_Impl, void*, pVoid )
-{
-    (void)pVoid; //unused
-    if ( pDialog->OK_Impl() && pDialog->Ok() )
-    {
-        const SfxPoolItem* aItems[2];
-        SfxTabDialogItem aItem( GetId(), *pDialog->GetOutputItemSet() );
-        aItems[0] = &aItem;
-        aItems[1] = NULL;
-        GetBindings().Execute( GetId(), aItems );
-    }
-
-    return 0;
-}
-
 void SfxTabDialogController::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
 {
     const SfxSetItem* pSetItem = PTR_CAST( SfxSetItem, pState );
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index ceb8050..c948c58 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -100,7 +100,6 @@ protected:
 
     sal_Bool                    bMySet;         // sal_True: Set loeschen im dtor
 
-    SfxStyleSheetBase(); // do not use!
     SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool&, SfxStyleFamily eFam, sal_uInt16 mask );
     SfxStyleSheetBase( const SfxStyleSheetBase& );
     virtual ~SfxStyleSheetBase();
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 2a1929e..595ed7b 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -154,25 +154,6 @@ SfxStyleSheetBase::SfxStyleSheetBase( const SfxStyleSheetBase& r )
         pSet = NULL;
 }
 
-static SfxStyleSheetBasePool& implGetStaticPool()
-{
-    static SfxStyleSheetBasePool* pSheetPool = 0;
-    static SfxItemPool* pBasePool = 0;
-    if( !pSheetPool )
-    {
-        UniString aName;
-        pBasePool = new SfxItemPool( aName, 0, 0, 0 );
-        pSheetPool = new SfxStyleSheetBasePool(*pBasePool);
-    }
-    return *pSheetPool;
-}
-
-SfxStyleSheetBase::SfxStyleSheetBase()
-: comphelper::OWeakTypeObject()
-, rPool( implGetStaticPool() )
-{
-}
-
 SfxStyleSheetBase::~SfxStyleSheetBase()
 {
 #ifdef DBG_UTIL
diff --git a/unusedcode.easy b/unusedcode.easy
index c4495d2..a613b74 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2032,6 +2032,8 @@ chart::EquidistantTickIter::gotoIndex(int)
 chart::UndoContext::UndoContext(com::sun::star::uno::Reference<com::sun::star::document::XUndoManager> const&, rtl::OUString const&)
 chart::UndoContext::~UndoContext()
 chelp::Databases::getInstallPathAsSystemPath()
+cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
+cmis::Content::queryChildren(std::list<rtl::Reference<cmis::Content>, std::allocator<rtl::Reference<cmis::Content> > >&)
 codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&)
 comphelper::AccessibleEventBuffer::AccessibleEventBuffer()
 comphelper::AccessibleEventBuffer::sendEvents() const
commit dd0602b18ae921e376a81fc8aa0989c59bcc89a2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 3 09:34:47 2011 +0100

    deliver the .pc file as well I guess

diff --git a/curl/makefile.mk b/curl/makefile.mk
index 862ff2c..322c465 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -159,6 +159,8 @@ OUT2INC= \
     include$/curl$/curlbuild.h		\
     include$/curl$/curlrules.h
 
+OUT2INC+=libcurl.pc
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
diff --git a/curl/prj/d.lst b/curl/prj/d.lst
index 162f485..045c420 100644
--- a/curl/prj/d.lst
+++ b/curl/prj/d.lst
@@ -9,7 +9,10 @@ mkdir: %_DEST%\inc\external\curl
 ..\%__SRC%\inc\curlbuild.h %_DEST%\inc\external\curl\curlbuild.h
 ..\%__SRC%\inc\curlrules.h %_DEST%\inc\external\curl\curlrules.h
 
+mkdir: %_DEST%\lib\pkgconfig
+..\%__SRC%\inc\libcurl.pc %_DEST%\lib\pkgconfig\libcurl.pc
+
 ..\%__SRC%\bin\libcurl*.dll %_DEST%\bin\*.dll
 ..\%__SRC%\lib\libcurl.* %_DEST%\lib\libcurl.*
 
-linklib: libcurl.*.*
\ No newline at end of file
+linklib: libcurl.*.*