[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source svx/inc

[Caolán McNamara]

 sfx2/inc/sfx2/sfx.hrc           |    1 +
 sfx2/source/dialog/templdlg.hrc |    5 -----
 svx/inc/svx/unoshape.hxx        |    2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit e9cf691797683e84df47d4ee71281594ad6eb298
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 30 15:53:53 2011 +0100

    tweak decl to avoid warning

diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index ce9d8fb..4febb88 100755
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -232,6 +232,7 @@
 #define	STR_STYLE_FILTER_ALL				(RID_SFX_START+12)
 // +13 already used!
 #define STR_STYLE_FILTER_HIERARCHICAL    	(RID_SFX_START+1200)
+#define STR_STYLE_ELEMTLIST					(RID_SFX_START+1202)
 
 #define STR_NONAME							(RID_SFX_START+100)
 #define STR_NONE							(RID_SFX_START+101)
diff --git a/sfx2/source/dialog/templdlg.hrc b/sfx2/source/dialog/templdlg.hrc
index 60b21b3..e9f341f 100755
--- a/sfx2/source/dialog/templdlg.hrc
+++ b/sfx2/source/dialog/templdlg.hrc
@@ -48,8 +48,3 @@
 #define BT_FLIST 8
 #define BT_VLIST 9
 #define BT_TOOL 10
-
-//IAccessibility2 Implementation 2009-----
-#define STR_STYLE_ELEMTLIST	18
-//-----IAccessibility2 Implementation 2009
-
commit e3412691700551479339c318ecdc7884e6898e46
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 30 09:42:11 2011 +0100

    tryQueryAggregation isn't implemented

diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index aa11c77..298824b 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -145,8 +145,6 @@ protected:
 
     ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const;
 
-    sal_Bool tryQueryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& rAny );
-
     sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName );
 
     /** called from the XActionLockable interface methods on initial locking */