[Libreoffice-commits] .: framework/inc framework/source
framework/inc/uielement/toolbarmanager.hxx|7 +-
framework/source/uielement/toolbarmanager.cxx | 28 +-
2 files changed, 12 insertions(+), 23 deletions(-)
New commits:
commit 6ae314ece2ecd6743a2d0f8a5eaca9b8b5dbeeaa
Author: Tor Lillqvist
Date: Wed Apr 11 20:30:26 2012 +0300
Bin pointless "added by shizhoubo" style comments
diff --git a/framework/inc/uielement/toolbarmanager.hxx
b/framework/inc/uielement/toolbarmanager.hxx
index 98430b9..98e351d 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -61,9 +61,8 @@
#include
#include
-//shizhoubo
#include
-//end
+
//_
// other includes
//_
@@ -161,10 +160,8 @@ class ToolBarManager : public
::com::sun::star::frame::XFrameActionListener
typedef std::vector< ControllerParams > ControllerParamsVector;
protected:
-//added for 33668 by shizhoubo : 2008:04
DECL_LINK( Command, CommandEvent * );
PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar);
-//end
DECL_LINK(Click, void *);
DECL_LINK(DropdownClick, void *);
DECL_LINK(DoubleClick, void *);
@@ -188,7 +185,7 @@ class ToolBarManager : public
::com::sun::star::frame::XFrameActionListener
::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > GetPropsForCommand( const
::rtl::OUString& rCmdURL );
void CreateControllers();
void UpdateControllers();
-//for update controller via Support Visiable by shizhoubo
+//for update controller via Support Visiable
void UpdateController( ::com::sun::star::uno::Reference<
::com::sun::star::frame::XToolbarController > xController);
//end
void AddFrameActionListener();
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index cc874b6..4fe4712 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -283,9 +283,8 @@ ToolBarManager::ToolBarManager( const Reference<
XMultiServiceFactory >& rServic
sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialog"
nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE;
-//added for issue33668 by shizhoubo
+
m_pToolBar->SetCommandHdl( LINK( this, ToolBarManager, Command ) );
-//end
m_pToolBar->SetMenuType( nMenuType );
m_pToolBar->SetMenuButtonHdl( LINK( this, ToolBarManager, MenuButton ) );
m_pToolBar->GetMenu()->SetSelectHdl( LINK( this, ToolBarManager,
MenuSelect ) );
@@ -507,7 +506,8 @@ void ToolBarManager::UpdateControllers()
}
m_bUpdateControllers = sal_False;
}
-//for update toolbar controller via Support Visible by shizhoubo
+
+//for update toolbar controller via Support Visible
void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference<
::com::sun::star::frame::XToolbarController > xController)
{
RTL_LOGFILE_CONTEXT( aLog, "framework (cd13)
::ToolBarManager::UpdateControllers" );
@@ -531,7 +531,7 @@ void ToolBarManager::UpdateController(
::com::sun::star::uno::Reference< ::com::
}
m_bUpdateControllers = sal_False;
}
-//end
+
void ToolBarManager::frameAction( const FrameActionEvent& Action )
throw ( RuntimeException )
{
@@ -1086,7 +1086,7 @@ void ToolBarManager::CreateControllers()
Sequence< Any > aArgs( comphelper::containerToSequence(
aPropertyVector ));
xInit->initialize( aArgs );
-//for Support Visiblitly by shizhoubo
+
if (pController)
{
if(aCommandURL == rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) ||
@@ -1096,8 +1096,6 @@ void ToolBarManager::CreateControllers()
)
pController->setFastPropertyValue_NoBroadcast(1,makeAny(sal_True));
}
-
-//end
}
// Request a item window from the toolbar controller and set it at
the VCL toolbar
@@ -1118,7 +1116,8 @@ void ToolBarManager::CreateControllers()
}
}
}
-//for update Controller via support visiable state by shizhoubo
+
+//for update Controller via support visiable state
Reference< XPropertySet > xPropSet( xController, UNO_QUERY );
if ( xPropSet.is() )
{
@@ -1141,8 +1140,6 @@ void ToolBarManager::CreateControllers()
{
}
}
-//end
-
}
AddFrameActionListener();
@@ -1724,7 +1721,6 @@ bool ToolBarMa
[Libreoffice-commits] .: framework/inc framework/source
framework/inc/services/pathsettings.hxx|4 --
framework/source/services/pathsettings.cxx | 54 +
2 files changed, 26 insertions(+), 32 deletions(-)
New commits:
commit 82af1483c8a259a9f111866f427d04452b27cb47
Author: Caolán McNamara
Date: Thu Mar 22 13:37:43 2012 +
annoying PATHES->PATHS typos
diff --git a/framework/inc/services/pathsettings.hxx
b/framework/inc/services/pathsettings.hxx
index e587cc5..660a24b 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -63,7 +63,6 @@
/* enable it if you whish to migrate old user settings (using the old cfg
schema) on demand
disable it in case only the new schema must be used.
*/
-#define MIGRATE_OLD_USER_PATHES
namespace framework
{
@@ -213,10 +212,9 @@ class PathSettings : public css::lang::XTypeProvider
,
/** filter "real user defined paths" from the old configuration schema
and set it as UserPaths on the new schema.
Can be removed with new major release ... */
-#ifdef MIGRATE_OLD_USER_PATHES
+
void impl_mergeOldUserPaths( PathSettings::PathInfo& rPath,
const OUStringList& lOld );
-#endif
/** reload one path directly from the new configuration schema (because
it was updated by any external code) */
diff --git a/framework/source/services/pathsettings.cxx
b/framework/source/services/pathsettings.cxx
index 4a5dd53..d70d2b3 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -63,7 +63,7 @@
// __
// non exported const
-const ::rtl::OUString
CFGPROP_USERPATHES(RTL_CONSTASCII_USTRINGPARAM("UserPaths"));
+const ::rtl::OUString
CFGPROP_USERPATHS(RTL_CONSTASCII_USTRINGPARAM("UserPaths"));
const ::rtl::OUString
CFGPROP_WRITEPATH(RTL_CONSTASCII_USTRINGPARAM("WritePath"));
/*
@@ -73,13 +73,13 @@ const ::rtl::OUString
CFGPROP_WRITEPATH(RTL_CONSTASCII_USTRINGPARAM("WritePath")
3 : write path "Template_write"string
*/
-const ::rtl::OUString
POSTFIX_INTERNAL_PATHES(RTL_CONSTASCII_USTRINGPARAM("_internal"));
-const ::rtl::OUString
POSTFIX_USER_PATHES(RTL_CONSTASCII_USTRINGPARAM("_user"));
+const ::rtl::OUString
POSTFIX_INTERNAL_PATHS(RTL_CONSTASCII_USTRINGPARAM("_internal"));
+const ::rtl::OUString POSTFIX_USER_PATHS(RTL_CONSTASCII_USTRINGPARAM("_user"));
const ::rtl::OUString
POSTFIX_WRITE_PATH(RTL_CONSTASCII_USTRINGPARAM("_writable"));
const sal_Int32 IDGROUP_OLDSTYLE= 0;
-const sal_Int32 IDGROUP_INTERNAL_PATHES = 1;
-const sal_Int32 IDGROUP_USER_PATHES = 2;
+const sal_Int32 IDGROUP_INTERNAL_PATHS = 1;
+const sal_Int32 IDGROUP_USER_PATHS = 2;
const sal_Int32 IDGROUP_WRITE_PATH = 3;
const sal_Int32 IDGROUP_COUNT = 4;
@@ -270,7 +270,7 @@ OUStringList PathSettings::impl_readOldFormat(const
::rtl::OUString& sPath)
// NO substitution here ! It's done outside ...
PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString&
sPath)
{
-const static ::rtl::OUString
CFGPROP_INTERNALPATHES(RTL_CONSTASCII_USTRINGPARAM("InternalPaths"));
+const static ::rtl::OUString
CFGPROP_INTERNALPATHS(RTL_CONSTASCII_USTRINGPARAM("InternalPaths"));
const static ::rtl::OUString
CFGPROP_ISSINGLEPATH(RTL_CONSTASCII_USTRINGPARAM("IsSinglePath"));
css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew();
@@ -283,11 +283,11 @@ PathSettings::PathInfo
PathSettings::impl_readNewFormat(const ::rtl::OUString& s
// read internal path list
css::uno::Reference< css::container::XNameAccess > xIPath;
-xPath->getByName(CFGPROP_INTERNALPATHES) >>= xIPath;
+xPath->getByName(CFGPROP_INTERNALPATHS) >>= xIPath;
aPathVal.lInternalPaths << xIPath->getElementNames();
// read user defined path list
-aPathVal.lUserPaths << xPath->getByName(CFGPROP_USERPATHES);
+aPathVal.lUserPaths << xPath->getByName(CFGPROP_USERPATHS);
// read the writeable path
xPath->getByName(CFGPROP_WRITEPATH) >>= aPathVal.sWritePath;
@@ -332,7 +332,7 @@ void PathSettings::impl_storePath(const
PathSettings::PathInfo& aPath)
{
::comphelper::ConfigurationHelper::writeRelativeKey(xCfgNew,
aResubstPath.sPathName,
-CFGPROP_USERPATHES,
+CFGPROP_USERPATHS,
css::uno::makeAny(aResubstPath.lUserPaths.getAsConstList()));
}
@@ -360,7 +360,6 @@ void PathSettings::impl_storePath(const
PathSettings::PathInfo& aPath)
}
//-
-#ifdef MIGRATE_OLD_USER_PATHES
void PathSettings:
[Libreoffice-commits] .: framework/inc framework/source offapi/com offapi/UnoApi_offapi.mk qadevOOo/objdsc qadevOOo/tests
framework/inc/services/layoutmanager.hxx |6
framework/source/layoutmanager/layoutmanager.cxx | 14 ++
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/frame/LayoutManager.idl |7 +
offapi/com/sun/star/frame/XInplaceLayout.idl | 68
++
qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv |2
qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java| 48
+++
7 files changed, 146 insertions(+)
New commits:
commit 10e580c57b907420e8c6d816325445a40a720e4a
Author: Thomas Arnhold
Date: Sat Feb 18 22:16:30 2012 +0100
Revert "offapi: remove obsolete XInplaceLayout"
This reverts commit 5ca858c01cb2e2aa93c8aca65fd271a900785e3f.
This change implicates some more changes in layoutmanager.hxx
see ::cppu::WeakImplHelper8. So keep it...
diff --git a/framework/inc/services/layoutmanager.hxx
b/framework/inc/services/layoutmanager.hxx
index 9c9d545..84931a3 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -161,6 +161,12 @@ namespace framework
virtual sal_Bool SAL_CALL isVisible() throw
(::com::sun::star::uno::RuntimeException);
//-
+// XInplaceLayout
+
//-
+virtual void SAL_CALL setInplaceMenuBar( sal_Int64
pInplaceMenuBarPointer ) throw (::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL resetInplaceMenuBar( ) throw
(::com::sun::star::uno::RuntimeException);
+
+
//-
// XMenuBarMergingAcceptor
//-
virtual sal_Bool SAL_CALL setMergedMenuBar( const
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >&
xMergedMenuBar )
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index 63a1569..0020a2e 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -26,6 +26,7 @@
*
/
+
// my own includes
#include
#include
@@ -33,6 +34,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1242,6 +1244,18 @@ throw (RuntimeException)
implts_reset( sal_True );
}
+void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 )
+throw (uno::RuntimeException)
+{
+OSL_FAIL( "This method is obsolete and should not be used!\n" );
+}
+
+void SAL_CALL LayoutManager::resetInplaceMenuBar()
+throw (uno::RuntimeException)
+{
+OSL_FAIL( "This method is obsolete and should not be used!\n" );
+}
+
//-
// XMenuBarMergingAcceptor
//-
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index b5a696a..1220adc 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2516,6 +2516,7 @@ $(eval $(call
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\
XFrameSetModel \
XFrames \
XFramesSupplier \
+ XInplaceLayout \
XInterceptorInfo \
XLayoutManager \
XLayoutManagerEventBroadcaster \
diff --git a/offapi/com/sun/star/frame/LayoutManager.idl
b/offapi/com/sun/star/frame/LayoutManager.idl
index 9e30376..aee70e7 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -99,6 +100,12 @@ service LayoutManager
*/
[optional] interface
::com::sun::star::frame::XLayoutManagerEventBroadcaster;
+/** interface to support settings a menu bar for inplace editing of
+components inside OpenOffice.org.
+
+@deprecated
+*/
+[optional] interface ::com::sun::star::frame::XInplaceLayout;
};
}; }; }; };
diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl
b/offapi/com/sun/star/frame/XInplaceLayout.idl
new file mode 100644
index 000..aeeeadd
--- /dev/null
+++ b/offapi/com/sun/star/frame/XInplaceLayout.idl
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE
