Author: arielch
Date: Sun Mar 9 06:19:15 2014
New Revision: 1575665
URL: http://svn.apache.org/r1575665
Log:
Fix line endings
Modified:
openoffice/trunk/main/svtools/inc/svtools/colrdlg.hxx
openoffice/trunk/main/svtools/source/dialogs/colrdlg.cxx
Modified: openoffice/trunk/main/svtools/inc/svtools/colrdlg.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/inc/svtools/colrdlg.hxx?rev=1575665&r1=1575664&r2=1575665&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/inc/svtools/colrdlg.hxx (original)
+++ openoffice/trunk/main/svtools/inc/svtools/colrdlg.hxx Sun Mar 9 06:19:15
2014
@@ -23,35 +23,35 @@
#define _SV_COLRDLG_HXX
#include "svtools/svtdllapi.h"
-#include <tools/color.hxx>
-
-class Window;
+#include <tools/color.hxx>
+
+class Window;
// ---------------
// - ColorDialog -
// ---------------
-namespace svtools
+namespace svtools
{
- // SELECT is the default
- enum ColorPickerMode { ColorPickerMode_SELECT = 0, ColorPickerMode_ADD =
1, ColorPickerMode_MODIFY = 2 };
-}
+ // SELECT is the default
+ enum ColorPickerMode { ColorPickerMode_SELECT = 0, ColorPickerMode_ADD =
1, ColorPickerMode_MODIFY = 2 };
+}
-class SVT_DLLPUBLIC SvColorDialog
-{
+class SVT_DLLPUBLIC SvColorDialog
+{
public:
- SvColorDialog( ::Window* pParent );
+ SvColorDialog( ::Window* pParent );
void SetColor( const Color& rColor );
const Color& GetColor() const;
- void SetMode( sal_Int16 eMode );
+ void SetMode( sal_Int16 eMode );
virtual short Execute();
-
-private:
- Window* mpParent;
- Color maColor;
- sal_Int16 meMode;
+
+private:
+ Window* mpParent;
+ Color maColor;
+ sal_Int16 meMode;
};
#endif // _SV_COLRDLG_HXX
Modified: openoffice/trunk/main/svtools/source/dialogs/colrdlg.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/dialogs/colrdlg.cxx?rev=1575665&r1=1575664&r2=1575665&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/dialogs/colrdlg.cxx (original)
+++ openoffice/trunk/main/svtools/source/dialogs/colrdlg.cxx Sun Mar 9
06:19:15 2014
@@ -26,27 +26,27 @@
#ifndef GCC
#endif
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <comphelper/processfactory.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/colrdlg.hxx>
-
-using rtl::OUString;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::ui::dialogs;
-
-// ---------------
-// - ColorDialog -
-// ---------------
-
-SvColorDialog::SvColorDialog( Window* pWindow )
-: mpParent( pWindow )
-, meMode( svtools::ColorPickerMode_SELECT )
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <comphelper/processfactory.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <svtools/colrdlg.hxx>
+
+using rtl::OUString;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::ui::dialogs;
+
+// ---------------
+// - ColorDialog -
+// ---------------
+
+SvColorDialog::SvColorDialog( Window* pWindow )
+: mpParent( pWindow )
+, meMode( svtools::ColorPickerMode_SELECT )
{
}
@@ -65,63 +65,63 @@ const Color& SvColorDialog::GetColor() c
}
// -----------------------------------------------------------------------
-
-void SvColorDialog::SetMode( sal_Int16 eMode )
-{
- meMode = eMode;
+
+void SvColorDialog::SetMode( sal_Int16 eMode )
+{
+ meMode = eMode;
}
// -----------------------------------------------------------------------
-
-short SvColorDialog::Execute()
-{
- short ret = 0;
- try
+
+short SvColorDialog::Execute()
+{
+ short ret = 0;
+ try
{
- const OUString sColor( RTL_CONSTASCII_USTRINGPARAM( "Color" ) );
- Reference< XMultiServiceFactory > xSMGR(
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
-
- Reference< com::sun::star::awt::XWindow > xParent(
VCLUnoHelper::GetInterface( mpParent ) );
-
- Sequence< Any > args(1);
- args[0] = Any( xParent );
-
- Reference< XExecutableDialog > xDialog(
xSMGR->createInstanceWithArguments(::rtl::OUString::createFromAscii("com.sun.star.cui.ColorPicker"),
args), UNO_QUERY_THROW );
- Reference< XPropertyAccess > xPropertyAccess( xDialog, UNO_QUERY_THROW
);
-
- Sequence< PropertyValue > props( 2 );
- props[0].Name = sColor;
- props[0].Value <<= (sal_Int32) maColor.GetColor();
- props[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Mode" ) );
- props[1].Value <<= (sal_Int16) meMode;
-
- xPropertyAccess->setPropertyValues( props );
-
- ret = xDialog->execute();
-
- if( ret )
- {
- props = xPropertyAccess->getPropertyValues();
- for( sal_Int32 n = 0; n < props.getLength(); n++ )
- {
- if( props[n].Name.equals( sColor ) )
- {
- sal_Int32 nColor = 0;
- if( props[n].Value >>= nColor )
- {
- maColor.SetColor( nColor );
- }
-
- }
- }
- }
+ const OUString sColor( RTL_CONSTASCII_USTRINGPARAM( "Color" ) );
+ Reference< XMultiServiceFactory > xSMGR(
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
+
+ Reference< com::sun::star::awt::XWindow > xParent(
VCLUnoHelper::GetInterface( mpParent ) );
+
+ Sequence< Any > args(1);
+ args[0] = Any( xParent );
+
+ Reference< XExecutableDialog > xDialog(
xSMGR->createInstanceWithArguments(::rtl::OUString::createFromAscii("com.sun.star.cui.ColorPicker"),
args), UNO_QUERY_THROW );
+ Reference< XPropertyAccess > xPropertyAccess( xDialog, UNO_QUERY_THROW
);
+
+ Sequence< PropertyValue > props( 2 );
+ props[0].Name = sColor;
+ props[0].Value <<= (sal_Int32) maColor.GetColor();
+ props[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Mode" ) );
+ props[1].Value <<= (sal_Int16) meMode;
+
+ xPropertyAccess->setPropertyValues( props );
+
+ ret = xDialog->execute();
+
+ if( ret )
+ {
+ props = xPropertyAccess->getPropertyValues();
+ for( sal_Int32 n = 0; n < props.getLength(); n++ )
+ {
+ if( props[n].Name.equals( sColor ) )
+ {
+ sal_Int32 nColor = 0;
+ if( props[n].Value >>= nColor )
+ {
+ maColor.SetColor( nColor );
+ }
+
+ }
+ }
+ }
}
- catch(Exception&)
+ catch(Exception&)
{
- OSL_ASSERT(false);
+ OSL_ASSERT(false);
}
-
- return ret;
+
+ return ret;
}
// -----------------------------------------------------------------------
