strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cws tl82: #i114267# code clean-up

Browse source
This commit is contained in:
Thomas Lange [tl] 2010-09-13 15:04:50 +02:00
parent a98530e403
commit a6d3374099
5 changed files with 1 additions and 471 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sw/source/ui/uno/SwXDocumentSettings.cxx Normal file → Executable file
View file

@ -31,7 +31,6 @@
#include <vos/mutex.hxx>
#include <sfx2/sfxbasecontroller.hxx>
#include <SwXDocumentSettings.hxx>
#include <SwXPrintPreviewSettings.hxx>
#include <comphelper/MasterPropertySetInfo.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
@ -221,7 +220,6 @@ SwXDocumentSettings::SwXDocumentSettings ( SwXTextDocument * pModel )
, mpPrinter( NULL )
{
registerSlave ( new SwXPrintSettings ( PRINT_SETTINGS_DOCUMENT, mpModel->GetDocShell()->GetDoc() ) );
registerSlave ( new SwXPrintPreviewSettings ( mpModel->GetDocShell()->GetDoc() ) );
}
SwXDocumentSettings::~SwXDocumentSettings()

375
sw/source/ui/uno/SwXPrintPreviewSettings.cxx
View file

@ -1,375 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#include <SwXPrintPreviewSettings.hxx>
#include <comphelper/ChainablePropertySetInfo.hxx>
#include <pvprtdat.hxx>
#include <swtypes.hxx>
#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_
#include <com/sun/star/beans/PropertyAttribute.hpp>
#endif
#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_
#include <com/sun/star/beans/PropertyAttribute.hpp>
#endif
#include <doc.hxx>
#include <vcl/svapp.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::comphelper;
using ::rtl::OUString;
enum SwPrintSettingsPropertyHandles
{
HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN,
HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN,
HANDLE_PRINTSET_PREVIEW_TOP_MARGIN,
HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN,
HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING,
HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING,
HANDLE_PRINTSET_PREVIEW_NUM_ROWS,
HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS,
HANDLE_PRINTSET_PREVIEW_LANDSCAPE
};
static ChainablePropertySetInfo * lcl_createPrintPreviewSettingsInfo()
{
static PropertyInfo aPrintPreviewSettingsMap_Impl[] =
{
{ RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLeftMargin" ), HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
{ RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintRightMargin" ), HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
{ RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintTopMargin" ), HANDLE_PRINTSET_PREVIEW_TOP_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
{ RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintBottomMargin" ),HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
{ RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintHorizontalSpacing" ),HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
{ RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintVerticalSpacing" ), HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
{ RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumRows" ), HANDLE_PRINTSET_PREVIEW_NUM_ROWS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 },
{ RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumColumns" ), HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 },
{ RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLandscape" ), HANDLE_PRINTSET_PREVIEW_LANDSCAPE, CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0 },
{ 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
};
return new ChainablePropertySetInfo ( aPrintPreviewSettingsMap_Impl );
}
SwXPrintPreviewSettings::SwXPrintPreviewSettings( SwDoc *pDoc)
: ChainablePropertySet ( lcl_createPrintPreviewSettingsInfo (), &Application::GetSolarMutex() )
, mbPreviewDataChanged( sal_False )
, mpDoc( pDoc)
{
}
/*-- 17.12.98 12:54:05---------------------------------------------------
-----------------------------------------------------------------------*/
SwXPrintPreviewSettings::~SwXPrintPreviewSettings()
throw()
{
}
Any SAL_CALL SwXPrintPreviewSettings::queryInterface( const Type& rType )
throw(RuntimeException)
{
return ::cppu::queryInterface ( rType ,
// OWeakObject interfaces
dynamic_cast< XInterface* >( dynamic_cast< OWeakObject* >(this) ) ,
dynamic_cast< XWeak* >( this ) ,
// my own interfaces
dynamic_cast< XServiceInfo* >( this ) ,
dynamic_cast< XPropertySet* >( this ) ,
dynamic_cast< XMultiPropertySet* >( this ) );
}
void SwXPrintPreviewSettings::acquire ()
throw ()
{
OWeakObject::acquire();
}
void SwXPrintPreviewSettings::release ()
throw ()
{
OWeakObject::release();
}
void SwXPrintPreviewSettings::_preSetValues ()
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
{
if ( mpDoc )
{
const SwPagePreViewPrtData *pConstPrtData = mpDoc->GetPreViewPrtData();
mpPreViewData = new SwPagePreViewPrtData;
if ( pConstPrtData )
{
mpPreViewData->SetLeftSpace ( pConstPrtData->GetLeftSpace() );
mpPreViewData->SetRightSpace ( pConstPrtData->GetRightSpace() );
mpPreViewData->SetTopSpace ( pConstPrtData->GetTopSpace() );
mpPreViewData->SetBottomSpace ( pConstPrtData->GetBottomSpace() );
mpPreViewData->SetHorzSpace ( pConstPrtData->GetHorzSpace() );
mpPreViewData->SetVertSpace ( pConstPrtData->GetVertSpace() );
mpPreViewData->SetRow ( pConstPrtData->GetRow() );
mpPreViewData->SetCol ( pConstPrtData->GetCol() );
mpPreViewData->SetLandscape ( pConstPrtData->GetLandscape() );
}
}
}
void SwXPrintPreviewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue )
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
{
switch( rInfo.mnHandle )
{
case HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN:
{
sal_Int32 nVal = 0;
rValue >>= nVal;
nVal = MM100_TO_TWIP( nVal );
if ( nVal != static_cast < sal_Int32 > (mpPreViewData->GetLeftSpace() ) )
{
mbPreviewDataChanged = sal_True;
mpPreViewData->SetLeftSpace( nVal );
}
}
break;
case HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN:
{
sal_Int32 nVal = 0;
rValue >>= nVal;
nVal = MM100_TO_TWIP( nVal );
if ( nVal != static_cast < sal_Int32 > (mpPreViewData->GetRightSpace() ) )
{
mbPreviewDataChanged = sal_True;
mpPreViewData->SetRightSpace( nVal );
}
}
break;
case HANDLE_PRINTSET_PREVIEW_TOP_MARGIN:
{
sal_Int32 nVal = 0;
rValue >>= nVal;
nVal = MM100_TO_TWIP( nVal );
if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetTopSpace() ) )
{
mbPreviewDataChanged = sal_True;
mpPreViewData->SetTopSpace( nVal );
}
}
break;
case HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN:
{
sal_Int32 nVal = 0;
rValue >>= nVal;
nVal = MM100_TO_TWIP( nVal );
if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetBottomSpace() ) )
{
mbPreviewDataChanged = sal_True;
mpPreViewData->SetBottomSpace( nVal );
}
}
break;
case HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING:
{
sal_Int32 nVal = 0;
rValue >>= nVal;
nVal = MM100_TO_TWIP( nVal );
if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetHorzSpace() ) )
{
mbPreviewDataChanged = sal_True;
mpPreViewData->SetHorzSpace( nVal );
}
}
break;
case HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING:
{
sal_Int32 nVal = 0;
rValue >>= nVal;
nVal = MM100_TO_TWIP( nVal );
if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetVertSpace() ) )
{
mbPreviewDataChanged = sal_True;
mpPreViewData->SetVertSpace( nVal );
}
}
break;
case HANDLE_PRINTSET_PREVIEW_NUM_ROWS:
{
sal_Int8 nVal = 0;
rValue >>= nVal;
if ( nVal != mpPreViewData->GetRow() )
{
mbPreviewDataChanged = sal_True;
mpPreViewData->SetRow( nVal );
}
}
break;
case HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS:
{
sal_Int8 nVal = 0;
rValue >>= nVal;
if ( nVal != mpPreViewData->GetCol() )
{
mbPreviewDataChanged = sal_True;
mpPreViewData->SetCol( nVal );
}
}
break;
case HANDLE_PRINTSET_PREVIEW_LANDSCAPE:
{
sal_Bool bVal = *(sal_Bool*)rValue.getValue();
if ( bVal != mpPreViewData->GetLandscape() )
{
mbPreviewDataChanged = sal_True;
mpPreViewData->SetLandscape ( bVal );
}
}
break;
default:
throw UnknownPropertyException();
}
}
void SwXPrintPreviewSettings::_postSetValues ()
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
{
if ( mbPreviewDataChanged )
{
mpDoc->SetPreViewPrtData ( mpPreViewData );
mbPreviewDataChanged = sal_False;
}
delete mpPreViewData;
mpPreViewData = NULL;
}
void SwXPrintPreviewSettings::_preGetValues ()
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
{
if (mpDoc)
mpConstPreViewData = mpDoc->GetPreViewPrtData();
}
void SwXPrintPreviewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue )
throw(UnknownPropertyException, WrappedTargetException )
{
sal_Bool bBool = TRUE;
sal_Bool bBoolVal;
switch( rInfo.mnHandle )
{
case HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN:
{
bBool = FALSE;
if ( mpConstPreViewData )
rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetLeftSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN:
{
bBool = FALSE;
if ( mpConstPreViewData )
rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetRightSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_TOP_MARGIN:
{
bBool = FALSE;
if ( mpConstPreViewData )
rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetTopSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN:
{
bBool = FALSE;
if ( mpConstPreViewData )
rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetBottomSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING:
{
bBool = FALSE;
if ( mpConstPreViewData )
rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetHorzSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING:
{
bBool = FALSE;
if ( mpConstPreViewData )
rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetVertSpace() ) );
}
break;
case HANDLE_PRINTSET_PREVIEW_NUM_ROWS:
{
bBool = FALSE;
if ( mpConstPreViewData )
rValue <<= static_cast < sal_Int8 > ( mpConstPreViewData->GetRow() );
}
break;
case HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS:
{
bBool = FALSE;
if ( mpConstPreViewData )
rValue <<= static_cast < sal_Int8 > ( mpConstPreViewData->GetCol() );
}
break;
case HANDLE_PRINTSET_PREVIEW_LANDSCAPE:
{
if (mpConstPreViewData)
bBoolVal = mpConstPreViewData->GetLandscape();
else
bBool = FALSE;
}
break;
default:
throw UnknownPropertyException();
}
if(bBool)
rValue.setValue(&bBoolVal, ::getBooleanCppuType());
}
void SwXPrintPreviewSettings::_postGetValues ()
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
{
mpConstPreViewData = NULL;
}
/* -----------------------------06.04.00 11:02--------------------------------
---------------------------------------------------------------------------*/
OUString SwXPrintPreviewSettings::getImplementationName(void) throw( RuntimeException )
{
return OUString( RTL_CONSTASCII_USTRINGPARAM ( "SwXPrintPreviewSettings" ) );
}
/* -----------------------------06.04.00 11:02--------------------------------
---------------------------------------------------------------------------*/
sal_Bool SwXPrintPreviewSettings::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return rServiceName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.text.PrintPreviewSettings") );
}
/* -----------------------------06.04.00 11:02--------------------------------
---------------------------------------------------------------------------*/
Sequence< OUString > SwXPrintPreviewSettings::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.PrintPreviewSettings" ) );
return aRet;
}

89
sw/source/ui/uno/SwXPrintPreviewSettings.hxx
View file

@ -1,89 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _SW_XPRINTPREVIEWSETTINGS_HXX_
#define _SW_XPRINTPREVIEWSETTINGS_HXX_
#ifdef PRECOMPILED
#include "ui_pch.hxx"
#endif
#include <comphelper/ChainablePropertySet.hxx>
#ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP
#include <com/sun/star/text/XTextDocument.hpp>
#endif
#include <cppuhelper/weak.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
class SwDoc;
class SwPagePreViewPrtData;
class SwXPrintPreviewSettings :public comphelper::ChainablePropertySet,
public cppu::OWeakObject,
public com::sun::star::lang::XServiceInfo
{
friend class SwXDocumentSettings;
protected:
sal_Bool mbPreviewDataChanged;
SwDoc* mpDoc;
SwPagePreViewPrtData *mpPreViewData;
const SwPagePreViewPrtData *mpConstPreViewData;
virtual void _preSetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual void _postSetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual void _preGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException );
virtual void _postGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual ~SwXPrintPreviewSettings()
throw();
public:
SwXPrintPreviewSettings(SwDoc *pDoc);
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( )
throw ();
virtual void SAL_CALL release( )
throw ();
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
throw( ::com::sun::star::uno::RuntimeException );
};
#endif

1
sw/source/ui/uno/makefile.mk Normal file → Executable file
View file

@ -55,7 +55,6 @@ SLO1FILES = \
$(SLO)$/dlelstnr.obj \
$(SLO)$/unofreg.obj \
$(SLO)$/SwXDocumentSettings.obj \
$(SLO)$/SwXPrintPreviewSettings.obj \
$(SLO)$/SwXFilterOptions.obj\
$(SLO)$/RefreshListenerContainer.obj \
$(SLO)$/unomodule.obj \

5
sw/source/ui/uno/unotxdoc.cxx Normal file → Executable file
View file

@ -107,7 +107,6 @@
#include <swcont.hxx>
#include <unodefaults.hxx>
#include <SwXDocumentSettings.hxx>
#include <SwXPrintPreviewSettings.hxx>
#include <doc.hxx>
#include <editeng/forbiddencharacterstable.hxx>
#include <svl/zforlist.hxx>
@ -1809,9 +1808,7 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic
}
else if (sCategory == C2U ("text") )
{
if( 0 == rServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.PrintPreviewSettings") ) )
xRet = Reference < XInterface > ( *new SwXPrintPreviewSettings ( pDocShell->GetDoc() ) );
else if( 0 == rServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.DocumentSettings") ) )
if( 0 == rServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.DocumentSettings") ) )
xRet = Reference < XInterface > ( *new SwXDocumentSettings ( this ) );
}
else if (sCategory == C2U ("chart2") )