diff options
46 files changed, 124 insertions, 183 deletions
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 64da4247bcb7..740ddc845224 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -38,7 +38,7 @@ #include "zoom.hrc" #include "zoom.hxx" -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <svx/viewlayoutitem.hxx> #include <dialmgr.hxx> #include <svx/zoom_def.hxx> diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index fa734c125e15..37fca8563926 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -64,7 +64,7 @@ #include <svl/lstner.hxx> #include <svtools/transfer.hxx> #include <svx/svdedtv.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 87d549be0605..fef632984b4a 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -33,7 +33,7 @@ #include "StartMarker.hxx" #include <svtools/ruler.hxx> #include <svx/svdedtv.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <vector> #include <boost/shared_ptr.hpp> diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 5d77ea8efef1..6b89a263f754 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -31,7 +31,7 @@ #include <svx/zoomsliderctrl.hxx> #include <svx/zoomctrl.hxx> #include <svx/svxids.hrc> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <svx/zoomslideritem.hxx> #include <vcl/svapp.hxx> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index a85de0c4f578..d781f06b16c1 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -116,7 +116,7 @@ #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/sizeitem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <svx/zoomslideritem.hxx> #include <editeng/brshitem.hxx> #include <svx/flagsdef.hxx> diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index d4cc424f5d46..dd0cadb253e4 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -30,7 +30,7 @@ #define SC_APPOPTIO_HXX #include <vcl/field.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <unotools/configitem.hxx> #include "scdllapi.h" #include "scmod.hxx" diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index 257d9111e73c..075b9a1458ee 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -43,7 +43,7 @@ #include <svx/postattr.hxx> #include <editeng/postitem.hxx> #include <sfx2/tplpitem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <editeng/brshitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 0f89fc7745d9..f62165f0390a 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -34,7 +34,7 @@ class ScrollBar; #include "address.hxx" #include <sfx2/viewfac.hxx> #include <sfx2/viewsh.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include "shellids.hxx" diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx index 47fab6e02ddd..a5c129bceff4 100644 --- a/sc/source/ui/inc/ui_pch.hxx +++ b/sc/source/ui/inc/ui_pch.hxx @@ -135,7 +135,7 @@ #include <svl/undo.hxx> #include <vcl/seleng.hxx> #include <rsc/rscsfx.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <vcl/scrbar.hxx> #include <viewutil.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 6ae8da2f8e23..4a08a9d545b4 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -28,7 +28,7 @@ #ifndef SC_VIEWDATA_HXX #define SC_VIEWDATA_HXX -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include "scdllapi.h" #include "viewopti.hxx" diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 3d66df19e4c9..007a8cc39162 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -56,7 +56,7 @@ #include <editeng/sizeitem.hxx> #include <editeng/svxenum.hxx> #include <svx/algitem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <svx/pageitem.hxx> #include <svx/svdattr.hxx> #include <svx/grafctrl.hxx> diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index c62c6a24e792..cfe7149c44cf 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -45,7 +45,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <svx/zoom_def.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <sfx2/request.hxx> #include <svx/svxdlg.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 2932e202f188..10ca6235f5c2 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -80,7 +80,7 @@ #include <svx/svdopage.hxx> #include <svx/svxids.hrc> #include <svx/ruler.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <svtools/tabbar.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index f2d4f0e8f24d..ec041293d236 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -81,7 +81,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <svx/svxids.hrc> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 519b29af2a2f..b34f104282a9 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -46,7 +46,7 @@ #include <svx/svdpagv.hxx> #include <svx/unoshape.hxx> #include <svx/unoshcol.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <com/sun/star/drawing/DrawViewMode.hpp> #include <com/sun/star/drawing/XLayerManager.hpp> #include <com/sun/star/view/DocumentZoomType.hpp> diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 6ecad4c30073..5f20f724ce87 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -34,7 +34,7 @@ #include <svx/svxids.hrc> #include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <editeng/editdata.hxx> #include <basic/sberrors.hxx> #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 4435d29346b5..5b0fc2e0d2e6 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -38,7 +38,7 @@ #include <svx/ruler.hxx> #include <editeng/numitem.hxx> #include <svx/rulritem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <svx/svxids.hrc> #include <svx/svdpagv.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 56ee97a448f0..d99fd9bb3972 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -35,7 +35,7 @@ #endif #include <svx/svdlayer.hxx> #ifndef _SVX_ZOOMITEM -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #endif #include <svx/svdpagv.hxx> #include <svl/ptitem.hxx> diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 7bd044807a43..1c894fdcf571 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -37,7 +37,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <svl/eitem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> +#include <svx/svxids.hrc> #include <vcl/msgbox.hxx> #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index f37b7a010926..acee1e622371 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -39,7 +39,7 @@ #include <sfx2/objface.hxx> #include <sot/exchange.hxx> #include <svx/ruler.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> #include <sfx2/shell.hxx> diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index f9d848b54058..6da9165dbcc3 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -214,6 +214,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/sfxbasemodel \ sfx2/source/doc/sfxmodelfactory \ sfx2/source/doc/syspath \ + sfx2/source/doc/zoomitem \ sfx2/source/explorer/nochaos \ sfx2/source/inet/inettbc \ sfx2/source/menu/mnuitem \ diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk index 4c2594c258fb..d0a8b22c8f27 100644 --- a/sfx2/Package_inc.mk +++ b/sfx2/Package_inc.mk @@ -134,5 +134,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sf $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/zoomitem.hxx,sfx2/zoomitem.hxx)) # vim: set noet sw=4 ts=4: diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index 462b00fb5e79..48e44b216792 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -323,10 +323,13 @@ #define MID_DOCINFO_ENCRYPTED 0x2c #define MID_DOCINFO_STATISTIC 0x33 #define MID_DOCINFO_CHARLOCALE 0x34 -#define MID_CATEGORY 0x35 -#define MID_COMPANY 0x36 -#define MID_MANAGER 0x37 -#define MID_LAST_USED_PROPID MID_MANAGER +#define MID_CATEGORY 0x35 +#define MID_COMPANY 0x36 +#define MID_MANAGER 0x37 +#define MID_TYPE 0x38 +#define MID_VALUE 0x39 +#define MID_VALUESET 0x40 +#define MID_LAST_USED_PROPID MID_VALUESET // Config-Ids ----------------------------------------------------------- diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index c6a86f1322fc..f29902ecce2b 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -200,6 +200,8 @@ #define ID_FILETP_READONLY (ID_FILETP_START + 0) #define ID_FILETP_TITLE (ID_FILETP_START + 1) +#define SID_ATTR_ZOOM (SID_SVX_START + 1419) + #define SID_EXPLORER_PROPS_START (SID_SFX_START + 1410) #define SID_EXPLORER_PROPS_END (SID_SFX_START + 1499) @@ -1024,4 +1026,3 @@ #define SID_CHG_PROTECT (SC_VIEW_START + 84) // eof ------------------------------------------------------------------------ - diff --git a/svx/inc/svx/zoomitem.hxx b/sfx2/inc/sfx2/zoomitem.hxx index 77cf645fbacd..592e81ff4fe5 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/sfx2/inc/sfx2/zoomitem.hxx @@ -29,8 +29,8 @@ #define _SVX_ZOOMITEM_HXX #include <svl/intitem.hxx> -#include <svx/svxids.hrc> -#include "svx/svxdllapi.h" +#include <sfx2/sfxsids.hrc> +#include "sfx2/dllapi.h" //------------------------------------------------------------------------- @@ -45,7 +45,7 @@ enum SvxZoomType //------------------------------------------------------------------------- -class SVX_DLLPUBLIC SvxZoomItem: public SfxUInt16Item +class SFX2_DLLPUBLIC SvxZoomItem: public SfxUInt16Item { sal_uInt16 nValueSet; // erlaubte Werte (siehe #defines unten) SvxZoomType eType; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index e1dd418a1331..b209baa7ba87 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -8290,3 +8290,29 @@ SfxInt16Item ThesaurusFromContext SID_THES GroupId = GID_TEXT; ] +//-------------------------------------------------------------------------- +SvxZoomItem Zoom SID_ATTR_ZOOM + +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = GID_VIEW; +] diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi index 421c1cb29529..ab335a96e047 100644 --- a/sfx2/sdi/sfxitems.sdi +++ b/sfx2/sdi/sfxitems.sdi @@ -88,3 +88,10 @@ item SfxScriptOrganizer SfxScriptOrganizerItem; item String SvxClipboardFmtItem; //! Dummy + struct SvxZoom + { + UINT16 Value MID_VALUE; + INT16 ValueSet MID_VALUESET; + INT16 Type MID_TYPE; + }; + item SvxZoom SvxZoomItem; diff --git a/svx/source/items/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 226d18db865a..d5906089ea1b 100644 --- a/svx/source/items/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -29,7 +29,7 @@ #include <tools/stream.hxx> #include <basic/sbxvar.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> @@ -118,111 +118,63 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberI { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - switch ( nMemberId ) - { - case 0 : - { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOM_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE )); - aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET )); - aSeq[1].Value <<= sal_Int16( nValueSet ); - aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); - aSeq[2].Value <<= sal_Int16( eType ); - rVal <<= aSeq; - } - break; - - case MID_VALUE: rVal <<= (sal_Int32) GetValue(); break; - case MID_VALUESET: rVal <<= (sal_Int16) nValueSet; break; - case MID_TYPE: rVal <<= (sal_Int16) eType; break; - default: - OSL_FAIL("svx::SvxZoomItem::QueryValue(), Wrong MemberId!"); - return false; - } + + assert(nMemberId == 0); + + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOM_PARAMS ); + aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE )); + aSeq[0].Value <<= sal_Int32( GetValue() ); + aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET )); + aSeq[1].Value <<= sal_Int16( nValueSet ); + aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); + aSeq[2].Value <<= sal_Int16( eType ); + rVal <<= aSeq; return true; } bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { -// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - switch ( nMemberId ) + assert(nMemberId == 0); + + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq; + if (( rVal >>= aSeq ) && ( aSeq.getLength() == ZOOM_PARAMS )) { - case 0 : + sal_Int32 nValueTmp( 0 ); + sal_Int16 nValueSetTmp( 0 ); + sal_Int16 nTypeTmp( 0 ); + sal_Bool bAllConverted( sal_True ); + sal_Int16 nConvertedCount( 0 ); + for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq; - if (( rVal >>= aSeq ) && ( aSeq.getLength() == ZOOM_PARAMS )) + if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUE )) { - sal_Int32 nValueTmp( 0 ); - sal_Int16 nValueSetTmp( 0 ); - sal_Int16 nTypeTmp( 0 ); - sal_Bool bAllConverted( sal_True ); - sal_Int16 nConvertedCount( 0 ); - for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) - { - if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUE )) - { - bAllConverted &= ( aSeq[i].Value >>= nValueTmp ); - ++nConvertedCount; - } - else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUESET )) - { - bAllConverted &= ( aSeq[i].Value >>= nValueSetTmp ); - ++nConvertedCount; - } - else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_TYPE )) - { - bAllConverted &= ( aSeq[i].Value >>= nTypeTmp ); - ++nConvertedCount; - } - } - - if ( bAllConverted && nConvertedCount == ZOOM_PARAMS ) - { - SetValue( (sal_uInt16)nValueTmp ); - nValueSet = nValueSetTmp; - eType = SvxZoomType( nTypeTmp ); - return true; - } + bAllConverted &= ( aSeq[i].Value >>= nValueTmp ); + ++nConvertedCount; } - - return false; - } - - case MID_VALUE: - { - sal_Int32 nVal = 0; - if ( rVal >>= nVal ) + else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUESET )) { - SetValue( (sal_uInt16)nVal ); - return true; + bAllConverted &= ( aSeq[i].Value >>= nValueSetTmp ); + ++nConvertedCount; } - else - return false; - } - - case MID_VALUESET: - case MID_TYPE: - { - sal_Int16 nVal = sal_Int16(); - if ( rVal >>= nVal ) + else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_TYPE )) { - if ( nMemberId == MID_VALUESET ) - nValueSet = (sal_Int16) nVal; - else if ( nMemberId == MID_TYPE ) - eType = SvxZoomType( (sal_Int16) nVal ); - return true; + bAllConverted &= ( aSeq[i].Value >>= nTypeTmp ); + ++nConvertedCount; } - else - return false; } - default: - OSL_FAIL("svx::SvxZoomItem::PutValue(), Wrong MemberId!"); - return false; + if ( bAllConverted && nConvertedCount == ZOOM_PARAMS ) + { + SetValue( (sal_uInt16)nValueTmp ); + nValueSet = nValueSetTmp; + eType = SvxZoomType( nTypeTmp ); + return true; + } } + + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index e59687ff2b18..ba30ac62028b 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -55,7 +55,7 @@ #include <editeng/editeng.hxx> #include <editeng/editview.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> SO2_DECL_REF(SmDocShell) SO2_IMPL_REF(SmDocShell) diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi index 019d2c5f5312..0cf73d036de4 100644 --- a/starmath/sdi/smitems.sdi +++ b/starmath/sdi/smitems.sdi @@ -580,16 +580,6 @@ item SvxLongULSpace SvxLongULSpaceItem; //------------------------------------------------------------------------- -struct SvxZoom -{ - INT32 Type MID_TYPE; - UINT16 ValueSet MID_VALUESET; - INT32 Percent MID_PERCENT; -}; -item SvxZoom SvxZoomItem; - -//------------------------------------------------------------------------- - item SbxObject SvxTabStopItem; diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index 076758d1c0a5..b46ca83a8327 100644 --- a/starmath/source/typemap.cxx +++ b/starmath/source/typemap.cxx @@ -125,7 +125,8 @@ #include <sfx2/msg.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> +#include <svx/svxids.hrc> #include <svl/slstitm.hxx> #define SFX_TYPEMAP diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index c425b75d02a7..52a7a542b847 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -62,7 +62,7 @@ #include <svx/dialogs.hrc> #include <editeng/editeng.hxx> #include <svx/svxdlg.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <vcl/decoview.hxx> #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index ba8ffa181b61..c294c73d39da 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -158,7 +158,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/items/SmartTagItem \ svx/source/items/svxerr \ svx/source/items/viewlayoutitem \ - svx/source/items/zoomitem \ svx/source/items/zoomslideritem \ svx/source/mnuctrls/clipboardctl \ svx/source/mnuctrls/fntctl \ diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index bd07e7b0caec..0b8014aac316 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -120,7 +120,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/unofill.hxx,svx/unofill.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/drawitem.hxx,svx/drawitem.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlgrhlp.hxx,svx/xmlgrhlp.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmresids.hrc,svx/fmresids.hrc)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomitem.hxx,svx/zoomitem.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtcfitm.hxx,svx/sdtcfitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdmetitm.hxx,svx/sdmetitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmtools.hxx,svx/fmtools.hxx)) diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index f66af83d2a3c..07b8dd7720bb 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -82,10 +82,8 @@ #define MID_RIGHT_MARGIN 0x47 #define MID_ROW_DIRECTION 0x48 #define MID_SIZE 0x4a -#define MID_TYPE 0x4c -#define MID_UPPER 0x4d -#define MID_USExxx 0x4e -#define MID_VALUESET 0x4f +#define MID_UPPER 0x4b +#define MID_USExxx 0x4c #define MID_ADR_CITY 0x50 #define MID_ADR_COMPANY 0x51 @@ -412,8 +410,6 @@ // Svx-Id's // -------------------------------------------------------------------------- -#define SID_ATTR_ZOOM ( SID_SVX_START + 0 ) - #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx index 828bbd50744b..356efb6e4069 100644 --- a/svx/inc/svx/unomid.hxx +++ b/svx/inc/svx/unomid.hxx @@ -65,9 +65,6 @@ #define MID_HORJUST_HORJUST 0 #define MID_HORJUST_ADJUST 1 -// SvxZoomItem -#define MID_VALUE 2 - // SvxObjectItem #define MID_START_X 1 #define MID_START_Y 2 diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 8afec8b9e48e..5e1917576bb6 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -11786,33 +11786,6 @@ XLineStyleItem XLineStyle SID_ATTR_LINE_STYLE ] //-------------------------------------------------------------------------- -SvxZoomItem Zoom SID_ATTR_ZOOM - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_VIEW; -] - -//-------------------------------------------------------------------------- SfxVoidItem Zoom100Percent SID_SIZE_REAL () [ diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi index ef1a954f3983..6824a6d68f4c 100644 --- a/svx/sdi/svxitems.sdi +++ b/svx/sdi/svxitems.sdi @@ -599,14 +599,6 @@ struct SvxProtect }; item SvxProtect SvxProtectItem; -struct SvxZoom -{ - UINT16 Value MID_VALUE; - INT16 ValueSet MID_VALUESET; - INT16 Type MID_TYPE; -}; -item SvxZoom SvxZoomItem; - struct SvxRulerObject { INT32 StartX MID_START_X; diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 1284075842d0..eed821dd2e3e 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -35,7 +35,7 @@ #include <svx/dialogs.hrc> #include "svx/zoomctrl.hxx" -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include "stbctrls.h" #include <svx/dialmgr.hxx> diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index b2af44fcc6fc..4187442b956a 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -31,7 +31,8 @@ #include <tools/string.hxx> #include <tools/color.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> +#include <svx/svxids.hrc> #include "swdllapi.h" #include "authratr.hxx" diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index fff8fceb1d63..22f9fce0db4b 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -41,7 +41,7 @@ // OD 19.02.2003 #107369# - method <SwAlignRect(..)> #include <frmtool.hxx> // OD 24.09.2003 #i19975# -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <printdata.hxx> #include <IDocumentDeviceAccess.hxx> diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index 329ba5e567d9..0073a5e996bf 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -33,7 +33,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewfac.hxx> #include <sfx2/viewsh.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include "swdllapi.h" #include "shellid.hxx" diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 229e8f5d810c..2d8acf631b67 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -36,7 +36,8 @@ #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> #include <editeng/svxenum.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> +#include <svx/svxids.hrc> #include <editeng/editstat.hxx> #include "swdllapi.h" #include <swtypes.hxx> diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 28280a0abdbf..3c5f15fd43ac 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -39,7 +39,7 @@ #include <sfx2/objitem.hxx> #include <sfx2/objsh.hxx> #include <svx/rulritem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <svx/viewlayoutitem.hxx> #include <svx/zoomslideritem.hxx> #include <svx/hlnkitem.hxx> diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index fa8a704247f8..d988bf54f8bf 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -44,7 +44,7 @@ #include <svl/zforlist.hxx> #include <unotxdoc.hxx> #include <cmdid.h> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <unomod.hxx> #include <vcl/svapp.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index 922eae695c75..5fd5b6f2b08b 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -32,7 +32,7 @@ #include <vcl/status.hxx> #include <sfx2/app.hxx> #include <svl/stritem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include "swtypes.hxx" #include "zoomctrl.hxx" |