curl/ExternalPackage_curl.mk | 2 ++
sfx2/inc/sfx2/ctrlitem.hxx | 2 ++
sfx2/source/control/ctrlitem.cxx | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
New commits:
commit 2174bb1af65d61904d3f45f2121416e7fb33b612
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Apr 22 14:06:22 2013 +0100
Restore SfxControllerItem::GetCoreMetric
was correctly removed by 9c2f7056a82c4d7719715ca1c77f8dd4c17aa24c but we
will
need it again soon
Change-Id: I7b2af6a17fc1c34d9313428e759e93fdde9ba0d7
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index bb7b61b..af6288e 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.hxx
@@ -71,6 +71,8 @@ public:
const SfxPoolItem* pState );
virtual void DeleteFloatingWindow();
+ SfxMapUnit GetCoreMetric() const;
+
static SfxItemState GetItemState( const SfxPoolItem* pState );
SAL_DLLPRIVATE sal_Bool IsBindable_Impl() const
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 317c16a..2b241c6 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -353,4 +353,43 @@ SfxItemState SfxControllerItem::GetItemState
: SFX_ITEM_AVAILABLE;
}
+//--------------------------------------------------------------------
+
+SfxMapUnit SfxControllerItem::GetCoreMetric() const
+
+/* [Description]
+
+ Gets the measurement unit from the competent pool, in which the Status
+ item exist.
+*/
+
+{
+ SfxStateCache *pCache = pBindings->GetStateCache( nId );
+ SfxDispatcher *pDispat = pBindings->GetDispatcher_Impl();
+
+ if ( !pDispat )
+ {
+ SfxViewFrame* pViewFrame = SfxViewFrame::Current();
+ if ( !pViewFrame )
+ SfxViewFrame::GetFirst();
+ if ( pViewFrame )
+ pDispat = pViewFrame->GetDispatcher();
+ }
+
+ if ( pDispat && pCache )
+ {
+ const SfxSlotServer *pServer = pCache->GetSlotServer( *pDispat );
+ if ( pServer )
+ {
+ SfxShell *pSh = pDispat->GetShell( pServer->GetShellLevel() );
+ SfxItemPool &rPool = pSh->GetPool();
+ sal_uInt16 nWhich = rPool.GetWhich( nId );
+ return rPool.GetMetric( nWhich );
+ }
+ }
+
+ DBG_WARNING( "W1: Can not find ItemPool!" );
+ return SFX_MAPUNIT_100TH_MM;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 81f336879b79d20ea82e7677c8332659c1fb454f
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Apr 22 14:25:39 2013 +0100
get curl building on aix
Change-Id: I4f8f2830a4c13637f6ee6aa06c554b88b95fcf45
diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk
index 495b4f9..f7881ea 100644
--- a/curl/ExternalPackage_curl.mk
+++ b/curl/ExternalPackage_curl.mk
@@ -21,6 +21,8 @@ ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call
gb_ExternalPackage_add_file,curl,lib/libcurl.a,lib/.libs/libcurl.a))
else ifeq ($(OS),ANDROID)
$(eval $(call
gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so))
+else ifeq ($(OS),AIX)
+$(eval $(call
gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
else
$(eval $(call
gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
$(eval $(call
gb_ExternalPackage_add_file,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
