incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1380609 - in /incubator/ooo/trunk/main/svx: source/core/coreservices.cxx source/tbxctrls/fontworkgallery.cxx util/svxcore.component
Date Tue, 04 Sep 2012 12:43:49 GMT
Author: hdu
Date: Tue Sep  4 12:43:49 2012
New Revision: 1380609

URL: http://svn.apache.org/viewvc?rev=1380609&view=rev
Log:
#i115922# fix Fontwork alignment and spacing controls

by capitalizing them consistently with the reference being their UNO names defined in main/helpcontent2/helpers/uno-commands.csv

Modified:
    incubator/ooo/trunk/main/svx/source/core/coreservices.cxx
    incubator/ooo/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx
    incubator/ooo/trunk/main/svx/util/svxcore.component

Modified: incubator/ooo/trunk/main/svx/source/core/coreservices.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/core/coreservices.cxx?rev=1380609&r1=1380608&r2=1380609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/core/coreservices.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/core/coreservices.cxx Tue Sep  4 12:43:49 2012
@@ -55,13 +55,13 @@ extern OUString SAL_CALL ExtrusionSurfac
 extern Reference< XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const
Reference< XMultiServiceFactory > &)  throw( RuntimeException );
 extern Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames()
throw( RuntimeException );
 
-extern OUString SAL_CALL FontWorkAlignmentControl_getImplementationName();
-extern Reference< XInterface > SAL_CALL FontWorkAlignmentControl_createInstance(const
Reference< XMultiServiceFactory > &)  throw( RuntimeException );
-extern Sequence< OUString > SAL_CALL FontWorkAlignmentControl_getSupportedServiceNames()
throw( RuntimeException );
-
-extern OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName();
-extern Reference< XInterface > SAL_CALL FontWorkCharacterSpacingControl_createInstance(const
Reference< XMultiServiceFactory > &)  throw( RuntimeException );
-extern Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupportedServiceNames()
throw( RuntimeException );
+extern OUString SAL_CALL FontworkAlignmentControl_getImplementationName();
+extern Reference< XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const
Reference< XMultiServiceFactory > &)  throw( RuntimeException );
+extern Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames()
throw( RuntimeException );
+
+extern OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName();
+extern Reference< XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const
Reference< XMultiServiceFactory > &)  throw( RuntimeException );
+extern Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames()
throw( RuntimeException );
 }
 
 extern "C"
@@ -113,21 +113,21 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL com
 				::svx::ExtrusionSurfaceControl_createInstance,
 				::svx::ExtrusionSurfaceControl_getSupportedServiceNames() );
 		}
-		else if( ::svx::FontWorkAlignmentControl_getImplementationName().equalsAscii( pImplName
) )
+		else if( ::svx::FontworkAlignmentControl_getImplementationName().equalsAscii( pImplName
) )
 		{
 			xFactory = ::cppu::createSingleFactory(
 				reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
-				::svx::FontWorkAlignmentControl_getImplementationName(),
-				::svx::FontWorkAlignmentControl_createInstance,
-				::svx::FontWorkAlignmentControl_getSupportedServiceNames() );
+				::svx::FontworkAlignmentControl_getImplementationName(),
+				::svx::FontworkAlignmentControl_createInstance,
+				::svx::FontworkAlignmentControl_getSupportedServiceNames() );
 		}
-		else if( ::svx::FontWorkCharacterSpacingControl_getImplementationName().equalsAscii( pImplName
) )
+		else if( ::svx::FontworkCharacterSpacingControl_getImplementationName().equalsAscii( pImplName
) )
 		{
 			xFactory = ::cppu::createSingleFactory(
 				reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
-				::svx::FontWorkCharacterSpacingControl_getImplementationName(),
-				::svx::FontWorkCharacterSpacingControl_createInstance,
-				::svx::FontWorkCharacterSpacingControl_getSupportedServiceNames() );
+				::svx::FontworkCharacterSpacingControl_getImplementationName(),
+				::svx::FontworkCharacterSpacingControl_createInstance,
+				::svx::FontworkCharacterSpacingControl_getSupportedServiceNames() );
 		}		if( xFactory.is())
 		{
 			xFactory->acquire();

Modified: incubator/ooo/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx?rev=1380609&r1=1380608&r2=1380609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx Tue Sep  4 12:43:49 2012
@@ -340,13 +340,13 @@ void FontWorkShapeTypeControl::Select( s
 }
 
 // ========================================================================
-// FontWorkAlignmentWindow
+// FontworkAlignmentWindow
 // ========================================================================
 
-class FontWorkAlignmentWindow : public ToolbarMenu
+class FontworkAlignmentWindow : public ToolbarMenu
 {
 public:
-	FontWorkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame
>& rFrame, Window* pParentWindow );
+	FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame
>& rFrame, Window* pParentWindow );
 
 	virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw (
RuntimeException );
 	virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -372,7 +372,7 @@ private:
 	void	implSetAlignment( int nAlignmentMode, bool bEnabled );
 };
 
-FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rController,
const Reference< XFrame >& rFrame, Window* pParentWindow )
+FontworkAlignmentWindow::FontworkAlignmentWindow( svt::ToolboxController& rController,
const Reference< XFrame >& rFrame, Window* pParentWindow )
 : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT ))
 , mrController( rController )
 , maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) )
@@ -390,7 +390,7 @@ FontWorkAlignmentWindow::FontWorkAlignme
 	bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
 	SetHelpId( HID_POPUP_FONTWORK_ALIGN );
-	SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) );
+	SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) );
 
 	appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1
);
 	appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2
);
@@ -407,7 +407,7 @@ FontWorkAlignmentWindow::FontWorkAlignme
 
 // -----------------------------------------------------------------------
 
-void FontWorkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
+void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
 {
 	int i;
 	for( i = 0; i < 5; i++ )
@@ -419,7 +419,7 @@ void FontWorkAlignmentWindow::implSetAli
 
 // -----------------------------------------------------------------------
 
-void SAL_CALL FontWorkAlignmentWindow::statusChanged( const frame::FeatureStateEvent&
Event ) throw ( RuntimeException )
+void SAL_CALL FontworkAlignmentWindow::statusChanged( const frame::FeatureStateEvent&
Event ) throw ( RuntimeException )
 {
 	if( Event.FeatureURL.Main.equals( msFontworkAlignment ) )
 	{
@@ -438,7 +438,7 @@ void SAL_CALL FontWorkAlignmentWindow::s
 
 // -----------------------------------------------------------------------
 
-void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
+void FontworkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
 	ToolbarMenu::DataChanged( rDCEvt );
 
@@ -456,7 +456,7 @@ void FontWorkAlignmentWindow::DataChange
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( FontWorkAlignmentWindow, SelectHdl, void *, EMPTYARG )
+IMPL_LINK( FontworkAlignmentWindow, SelectHdl, void *, EMPTYARG )
 {
 	if ( IsInPopupMode() )
 		EndPopupMode();
@@ -477,13 +477,13 @@ IMPL_LINK( FontWorkAlignmentWindow, Sele
 }
 
 // ========================================================================
-// FontWorkAlignmentControl
+// FontworkAlignmentControl
 // ========================================================================
 
-class FontWorkAlignmentControl : public svt::PopupWindowController
+class FontworkAlignmentControl : public svt::PopupWindowController
 {
 public:
-	FontWorkAlignmentControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory
>& rServiceManager );
+	FontworkAlignmentControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory
>& rServiceManager );
 
 	virtual ::Window* createPopupWindow( ::Window* pParent );
 
@@ -497,30 +497,30 @@ public:
 
 // -----------------------------------------------------------------------
 
-FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMultiServiceFactory
>& rServiceManager )
+FontworkAlignmentControl::FontworkAlignmentControl( const Reference< lang::XMultiServiceFactory
>& rServiceManager )
 : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString(
RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) )
 {
 }
 
 // -----------------------------------------------------------------------
 
-::Window* FontWorkAlignmentControl::createPopupWindow( ::Window* pParent )
+::Window* FontworkAlignmentControl::createPopupWindow( ::Window* pParent )
 {
-    return new FontWorkAlignmentWindow( *this, m_xFrame, pParent );
+    return new FontworkAlignmentWindow( *this, m_xFrame, pParent );
 }
 
 // -----------------------------------------------------------------------
 // XServiceInfo
 // -----------------------------------------------------------------------
 
-OUString SAL_CALL FontWorkAlignmentControl_getImplementationName()
+OUString SAL_CALL FontworkAlignmentControl_getImplementationName()
 {
-	return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontWorkAlignmentController"
));
+	return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkAlignmentController"
));
 }
 
 // --------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL FontWorkAlignmentControl_getSupportedServiceNames() throw(
RuntimeException )
+Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw(
RuntimeException )
 {
     Sequence< OUString > aSNS( 1 );
     aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController"
));
@@ -529,32 +529,32 @@ Sequence< OUString > SAL_CALL FontWorkAl
 
 // --------------------------------------------------------------------
 
-Reference< XInterface > SAL_CALL SAL_CALL FontWorkAlignmentControl_createInstance(
const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance(
const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-	return *new FontWorkAlignmentControl( rSMgr );
+	return *new FontworkAlignmentControl( rSMgr );
 }
 
 // --------------------------------------------------------------------
 
-OUString SAL_CALL FontWorkAlignmentControl::getImplementationName(  ) throw (RuntimeException)
+OUString SAL_CALL FontworkAlignmentControl::getImplementationName(  ) throw (RuntimeException)
 {
-	return FontWorkAlignmentControl_getImplementationName();
+	return FontworkAlignmentControl_getImplementationName();
 }
 
 // --------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL FontWorkAlignmentControl::getSupportedServiceNames( 
) throw (RuntimeException)
+Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames( 
) throw (RuntimeException)
 {
-	return FontWorkAlignmentControl_getSupportedServiceNames();
+	return FontworkAlignmentControl_getSupportedServiceNames();
 }
 
 
 // ####################################################################
 
-class FontWorkCharacterSpacingWindow : public ToolbarMenu
+class FontworkCharacterSpacingWindow : public ToolbarMenu
 {
 public:
-	FontWorkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference<
XFrame >& rFrame, Window* pParentWindow );
+	FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference<
XFrame >& rFrame, Window* pParentWindow );
 
 	virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent&
Event ) throw ( ::com::sun::star::uno::RuntimeException );
 private:
@@ -572,14 +572,14 @@ private:
 
 // -----------------------------------------------------------------------
 
-FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( svt::ToolboxController&
rController, const Reference< XFrame >& rFrame, Window* pParentWindow )
+FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxController&
rController, const Reference< XFrame >& rFrame, Window* pParentWindow )
 : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING ))
 , mrController( rController )
 , msFontworkCharacterSpacing( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacing"
) )
 , msFontworkKernCharacterPairs( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkKernCharacterPairs"
) )
 {
 	SetHelpId( HID_POPUP_FONTWORK_CHARSPACE );
-	SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) );
+	SetSelectHdl( LINK( this, FontworkCharacterSpacingWindow, SelectHdl ) );
 
 	appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK );
 	appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK );
@@ -600,7 +600,7 @@ FontWorkCharacterSpacingWindow::FontWork
 
 // -----------------------------------------------------------------------
 
-void FontWorkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharacterSpacing,
bool bEnabled )
+void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharacterSpacing,
bool bEnabled )
 {
 	sal_Int32 i;
 	for ( i = 0; i < 6; i++ )
@@ -626,7 +626,7 @@ void FontWorkCharacterSpacingWindow::imp
 
 // -----------------------------------------------------------------------
 
-void FontWorkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool bEnabled )
+void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool bEnabled )
 {
 	enableEntry( 6, bEnabled );
 	checkEntry( 6, bEnabled );
@@ -634,7 +634,7 @@ void FontWorkCharacterSpacingWindow::imp
 
 // -----------------------------------------------------------------------
 
-void SAL_CALL FontWorkCharacterSpacingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent&
Event ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent&
Event ) throw ( ::com::sun::star::uno::RuntimeException )
 {
 	if( Event.FeatureURL.Main.equals( msFontworkCharacterSpacing ) )
 	{
@@ -666,7 +666,7 @@ void SAL_CALL FontWorkCharacterSpacingWi
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG )
+IMPL_LINK( FontworkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG )
 {
 	if ( IsInPopupMode() )
 		EndPopupMode();
@@ -717,13 +717,13 @@ IMPL_LINK( FontWorkCharacterSpacingWindo
 }
 
 // ========================================================================
-// FontWorkCharacterSpacingControl
+// FontworkCharacterSpacingControl
 // ========================================================================
 
-class FontWorkCharacterSpacingControl : public svt::PopupWindowController
+class FontworkCharacterSpacingControl : public svt::PopupWindowController
 {
 public:
-	FontWorkCharacterSpacingControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory
>& rServiceManager );
+	FontworkCharacterSpacingControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory
>& rServiceManager );
 
 	virtual ::Window* createPopupWindow( ::Window* pParent );
 
@@ -735,30 +735,30 @@ public:
 };
 
 
-FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Reference< lang::XMultiServiceFactory
>& rServiceManager )
+FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Reference< lang::XMultiServiceFactory
>& rServiceManager )
 : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString(
RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingFloater" ) ) )
 {
 }
 
 // -----------------------------------------------------------------------
 
-::Window* FontWorkCharacterSpacingControl::createPopupWindow( ::Window* pParent )
+::Window* FontworkCharacterSpacingControl::createPopupWindow( ::Window* pParent )
 {
-    return new FontWorkCharacterSpacingWindow( *this, m_xFrame, pParent );
+    return new FontworkCharacterSpacingWindow( *this, m_xFrame, pParent );
 }
 
 // -----------------------------------------------------------------------
 // XServiceInfo
 // -----------------------------------------------------------------------
 
-OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName()
+OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName()
 {
-	return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontWorkCharacterSpacingController"
));
+	return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkCharacterSpacingController"
));
 }
 
 // --------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupportedServiceNames()
throw( RuntimeException )
+Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames()
throw( RuntimeException )
 {
     Sequence< OUString > aSNS( 1 );
     aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController"
));
@@ -767,23 +767,23 @@ Sequence< OUString > SAL_CALL FontWorkCh
 
 // --------------------------------------------------------------------
 
-Reference< XInterface > SAL_CALL SAL_CALL FontWorkCharacterSpacingControl_createInstance(
const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance(
const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-	return *new FontWorkCharacterSpacingControl( rSMgr );
+	return *new FontworkCharacterSpacingControl( rSMgr );
 }
 
 // --------------------------------------------------------------------
 
-OUString SAL_CALL FontWorkCharacterSpacingControl::getImplementationName(  ) throw (RuntimeException)
+OUString SAL_CALL FontworkCharacterSpacingControl::getImplementationName(  ) throw (RuntimeException)
 {
-	return FontWorkCharacterSpacingControl_getImplementationName();
+	return FontworkCharacterSpacingControl_getImplementationName();
 }
 
 // --------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl::getSupportedServiceNames(
 ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames(
 ) throw (RuntimeException)
 {
-	return FontWorkCharacterSpacingControl_getSupportedServiceNames();
+	return FontworkCharacterSpacingControl_getSupportedServiceNames();
 }
 
 // ========================================================================

Modified: incubator/ooo/trunk/main/svx/util/svxcore.component
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/util/svxcore.component?rev=1380609&r1=1380608&r2=1380609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/util/svxcore.component (original)
+++ incubator/ooo/trunk/main/svx/util/svxcore.component Tue Sep  4 12:43:49 2012
@@ -36,10 +36,10 @@
   <implementation name="com.sun.star.comp.svx.ExtrusionSurfaceController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.comp.svx.FontWorkAlignmentController">
+  <implementation name="com.sun.star.comp.svx.FontworkAlignmentController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.comp.svx.FontWorkCharacterSpacingController">
+  <implementation name="com.sun.star.comp.svx.FontworkCharacterSpacingController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
 </component>



Mime
View raw message