diff options
Diffstat (limited to 'svx')
57 files changed, 614 insertions, 62 deletions
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index cae5703fae06..fa4d86cdad1b 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -60,6 +60,7 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/dialog/bmpmask.src \ svx/source/dialog/contdlg.src \ svx/source/dialog/ctredlin.src \ + svx/source/dialog/compressgraphicdialog.src \ svx/source/dialog/dlgctrl.src \ svx/source/dialog/docrecovery.src \ svx/source/dialog/fontwork.src \ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 3ce31edd0a48..0a65c1d15c91 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ utl \ vcl \ xo \ - xcr \ + xmlscript \ $(gb_STDLIBS) \ )) @@ -100,6 +100,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/connctrl \ svx/source/dialog/_contdlg \ svx/source/dialog/contwnd \ + svx/source/dialog/compressgraphicdialog \ svx/source/dialog/ctredlin \ svx/source/dialog/databaseregistrationui \ svx/source/dialog/dialcontrol \ diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index 2490c24e8d80..392dcab57e26 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -554,5 +554,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/extedit.hxx,svx/extedit.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphichelper.hxx,svx/graphichelper.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/compressgraphicdialog.hxx,svx/compressgraphicdialog.hxx)) # vim: set noet sw=4 ts=4: diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 8ab7e4bfeb91..0f56324958ee 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -262,6 +262,11 @@ Command = ".uno:ExternalEdit" ; \ Text [ en-US ] = "Edit with External Tool..." ; \ +#define ITEM_COMPRESS_GRAPHIC \ + Identifier = SID_COMPRESS_GRAPHIC ; \ + Command = ".uno:CompressGraphic" ; \ + Text [ en-US ] = "Compress Graphic..." ; \ + #define ITEM_SAVE_GRAPHIC \ Identifier = SID_SAVE_GRAPHIC ; \ Command = ".uno:SaveGraphic" ; \ diff --git a/svx/inc/svx/compressgraphicdialog.hxx b/svx/inc/svx/compressgraphicdialog.hxx new file mode 100644 index 000000000000..a33bb768f79c --- /dev/null +++ b/svx/inc/svx/compressgraphicdialog.hxx @@ -0,0 +1,69 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef _COMPRESS_GRAPHICS_DIALOG_HXX +#define _COMPRESS_GRAPHICS_DIALOG_HXX + +#include <vcl/dialog.hxx> +#include <vcl/button.hxx> +#include <vcl/fixed.hxx> +#include <vcl/lstbox.hxx> +#include <vcl/field.hxx> +#include <sfx2/bindings.hxx> +#include "svx/svxdllapi.h" + +class SVX_DLLPUBLIC CompressGraphicsDialog : public ModalDialog +{ +private: + FixedText m_aFixedText2X; + FixedText m_aFixedText2; + FixedText m_aFixedText3X; + FixedText m_aFixedText3; + FixedText m_aFixedText4X; + FixedText m_aFixedText4; + FixedText m_aFixedText5X; + FixedText m_aFixedText5; + FixedText m_aFixedText6X; + FixedText m_aFixedText6; + ComboBox m_aResolutionLB; + MetricField m_aMFQuality; + CheckBox m_aLossless; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; + HelpButton m_aBtnHelp; + PushButton m_aBtnCalculate; + + Graphic m_aGraphic; + Size m_aViewSize100mm; + SfxBindings& m_rBindings; + + DECL_LINK( ResolutionModifiedHdl, void* ); + DECL_LINK( ClickHdl, void* ); + + void Update(); + +public: + CompressGraphicsDialog( Window* pParent, const Graphic& rGraphic, const Size& rViewSize100mm, SfxBindings& rBindings ); + virtual ~CompressGraphicsDialog(); + + Graphic GetCompressedGraphic(); +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 12ee38a830b2..8d21cfdc46ef 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -243,6 +243,7 @@ #define RID_SVXTBX_STYLE (RID_SVX_START + 120) #define RID_SVXDLG_PASSWORD (RID_SVX_START + 141) +#define RID_SVXDLG_COMPRESSGRAPHICS (RID_SVX_START + 142) // Dialog for functions #define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206) diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index 7baf253e01f6..37a7699ed51f 100644 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -89,6 +89,7 @@ public: sal_uInt16 InsertLanguage( const LanguageType eLangType, sal_uInt16 nPos = LISTBOX_APPEND ); sal_uInt16 InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos = LISTBOX_APPEND ); + sal_uInt16 InsertSystemLanguage( sal_uInt16 nPos = LISTBOX_APPEND ); sal_uInt16 InsertLanguage( const LanguageType eLangType, sal_Bool bCheckEntry, sal_uInt16 nPos = LISTBOX_APPEND ); void RemoveLanguage( const LanguageType eLangType ); diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 6acefcb38208..a932a117bb99 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -936,9 +936,10 @@ #define SID_EXTERNAL_EDIT (SID_SVX_START+1113) #define SID_ATTR_PAGE_SHARED_FIRST (SID_SVX_START+1114) #define SID_SAVE_GRAPHIC (SID_SVX_START+1115) +#define SID_COMPRESS_GRAPHIC (SID_SVX_START+1116) // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id -#define SID_SVX_FIRSTFREE (SID_SAVE_GRAPHIC + 1) +#define SID_SVX_FIRSTFREE (SID_COMPRESS_GRAPHIC + 1) // -------------------------------------------------------------------------- // Overflow check for slot IDs diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 5344e1764b91..eea97a40a5bd 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -5996,6 +5996,30 @@ SfxVoidItem SaveGraphic SID_SAVE_GRAPHIC GroupId = GID_MODIFY; ] +SfxVoidItem CompressGraphic SID_COMPRESS_GRAPHIC +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_MODIFY; +] + //-------------------------------------------------------------------------- SfxBoolItem Init3D SID_3D_INIT diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index fce702114089..29cabefa5c40 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -111,7 +111,7 @@ void ExternalToolEdit::Edit( GraphicObject* pGraphicObject ) osl::FileBase::createTempFile(0, &pHandle, &tempFileBase); // Move it to a file name with image extension properly set - tempFileName = tempFileBase + rtl::OUString(String('.')) + rtl::OUString(fExtension); + tempFileName = tempFileBase + rtl::OUString('.') + rtl::OUString(fExtension); osl::File::move(tempFileBase, tempFileName); //Write Graphic to the Temp File diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 5bbd61dd4530..5827495b22dd 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -29,7 +29,7 @@ #include <vcl/wrkwin.hxx> #include <sot/factory.hxx> #include <tools/shl.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <tools/helpers.hxx> #include <vcl/msgbox.hxx> #include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx new file mode 100644 index 000000000000..b1bdb6ad9621 --- /dev/null +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -0,0 +1,241 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <svx/dialogs.hrc> +#include <svx/dialmgr.hxx> +#include <vcl/graph.hxx> +#include <compressgraphicdialog.hrc> +#include <svx/compressgraphicdialog.hxx> +#include <dlgunit.hxx> +#include <vcl/virdev.hxx> +#include <sfx2/dispatch.hxx> +#include <vcl/svapp.hxx> +#include <comphelper/processfactory.hxx> +#include <svtools/filter.hxx> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> + +using namespace com::sun::star::uno; +using namespace com::sun::star::beans; + +CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, const Graphic& rGraphic, const Size& rViewSize100mm, SfxBindings& rBindings ) : + ModalDialog ( pParent, SVX_RES( RID_SVXDLG_COMPRESSGRAPHICS ) ), + m_aFixedText2X ( this, SVX_RES( FT_CG_2_X ) ), + m_aFixedText2 ( this, SVX_RES( FT_CG_2 ) ), + m_aFixedText3X ( this, SVX_RES( FT_CG_3_X ) ), + m_aFixedText3 ( this, SVX_RES( FT_CG_3 ) ), + m_aFixedText4X ( this, SVX_RES( FT_CG_4_X ) ), + m_aFixedText4 ( this, SVX_RES( FT_CG_4 ) ), + m_aFixedText5X ( this, SVX_RES( FT_CG_5_X ) ), + m_aFixedText5 ( this, SVX_RES( FT_CG_5 ) ), + m_aFixedText6X ( this, SVX_RES( FT_CG_6_X ) ), + m_aFixedText6 ( this, SVX_RES( FT_CG_6 ) ), + m_aResolutionLB ( this, SVX_RES( LB_CG_RESOLUTION ) ), + m_aMFQuality ( this, SVX_RES( MF_CG_QUALITY ) ), + m_aLossless ( this, SVX_RES( CB_CG_LOSSLESS ) ), + m_aBtnOK ( this, SVX_RES( BUTTON_CG_OK ) ), + m_aBtnCancel ( this, SVX_RES( BUTTON_CG_CANCEL ) ), + m_aBtnHelp ( this, SVX_RES( BUTTON_CG_HELP ) ), + m_aBtnCalculate ( this, SVX_RES( BUTTON_CG_CALCULATE ) ), + m_aGraphic ( rGraphic ), + m_aViewSize100mm ( rViewSize100mm ), + m_rBindings ( rBindings ) +{ + FreeResource(); + + SetStyle(GetStyle() | WB_CENTER | WB_VCENTER); + m_aMFQuality.SetValue( 90L ); + m_aResolutionLB.SetText(String("96 DPI")); + m_aResolutionLB.SetModifyHdl( LINK( this, CompressGraphicsDialog, ResolutionModifiedHdl )); + m_aBtnCalculate.SetClickHdl( LINK( this, CompressGraphicsDialog, ClickHdl ) ); + Update(); +} + +CompressGraphicsDialog::~CompressGraphicsDialog() +{ +} + +void CompressGraphicsDialog::Update() +{ + const FieldUnit eFieldUnit = m_rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); + LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() ); + sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0]; + + VirtualDevice* pDummyVDev = new VirtualDevice(); + pDummyVDev->EnableOutput( false ); + pDummyVDev->SetMapMode( m_aGraphic.GetPrefMapMode() ); + + Size aPixelSize = m_aGraphic.GetSizePixel(); + Size aOriginalSize100mm( pDummyVDev->PixelToLogic( m_aGraphic.GetSizePixel(), MAP_100TH_MM ) ); + + String aBitmapSizeString; + aBitmapSizeString += GetUnitString( aOriginalSize100mm.Width(), eFieldUnit, cSep ); + aBitmapSizeString += String( " x " ) ; + aBitmapSizeString += GetUnitString( aOriginalSize100mm.Height(), eFieldUnit, cSep ); + aBitmapSizeString += String( " ( " ) ; + aBitmapSizeString += UniString::CreateFromInt32(aPixelSize.Width()); + aBitmapSizeString += String( " x " ) ; + aBitmapSizeString += UniString::CreateFromInt32(aPixelSize.Height()); + aBitmapSizeString += String( " px )" ) ; + m_aFixedText2.SetText(aBitmapSizeString); + + String aViewSizeString; + + int aValX = aPixelSize.Width() * 100 / MetricField::ConvertValue(m_aViewSize100mm.Width(), 2, MAP_100TH_MM, FUNIT_INCH); + //int aValY = aPixelSize.Height() * 100 / MetricField::ConvertValue(m_aViewSize100mm.Height(), 2, MAP_100TH_MM, FUNIT_INCH); + + aViewSizeString += GetUnitString( m_aViewSize100mm.Width(), eFieldUnit, cSep ); + aViewSizeString += String( " x " ) ; + aViewSizeString += GetUnitString( m_aViewSize100mm.Height(), eFieldUnit, cSep ); + aViewSizeString += ( " at " ) ; + aViewSizeString += UniString::CreateFromInt32(aValX); + aViewSizeString += ( " DPI" ) ; + m_aFixedText3.SetText(aViewSizeString); + + int aResolution = m_aResolutionLB.GetText().ToInt32(); + int nPixelX = (sal_Int32)((double)MetricField::ConvertValue(m_aViewSize100mm.Width(), 2, MAP_100TH_MM, FUNIT_INCH) / 100 * aResolution ); + int nPixelY = (sal_Int32)((double)MetricField::ConvertValue(m_aViewSize100mm.Height(), 2, MAP_100TH_MM, FUNIT_INCH) / 100 * aResolution ); + + SvMemoryStream aMemStream; + aMemStream.SetVersion( SOFFICE_FILEFORMAT_CURRENT ); + m_aGraphic.ExportNative(aMemStream); + aMemStream.Seek( STREAM_SEEK_TO_END ); + sal_Int32 aNativeSize = aMemStream.Tell(); + + String aCompressedSizeString; + aCompressedSizeString += UniString::CreateFromInt32(nPixelX); + aCompressedSizeString += String( " x " ) ; + aCompressedSizeString += UniString::CreateFromInt32(nPixelY); + aCompressedSizeString += ( " at " ) ; + aCompressedSizeString += UniString::CreateFromInt32(aResolution); + aCompressedSizeString += ( " DPI" ) ; + m_aFixedText4.SetText(aCompressedSizeString); + + String aNativeSizeString; + aNativeSizeString += UniString::CreateFromInt32(aNativeSize / 1024); + aNativeSizeString += String( " kiB" ) ; + + m_aFixedText5.SetText(aNativeSizeString); + m_aFixedText6.SetText(String("??")); +} + +IMPL_LINK_NOARG( CompressGraphicsDialog, ResolutionModifiedHdl ) +{ + Update(); + return 0L; +} + +IMPL_LINK_NOARG( CompressGraphicsDialog, ClickHdl ) +{ + int aResolution = m_aResolutionLB.GetText().ToInt32(); + sal_Int32 aSize = 0; + + if ( aResolution > 0 ) + { + long nPixelX = (long)((double) MetricField::ConvertValue(m_aViewSize100mm.Width(), 2, MAP_100TH_MM, FUNIT_INCH) / 100.0 * (double) aResolution ); + long nPixelY = (long)((double) MetricField::ConvertValue(m_aViewSize100mm.Height(), 2, MAP_100TH_MM, FUNIT_INCH) / 100.0 * (double) aResolution ); + + BitmapEx bitmap = m_aGraphic.GetBitmapEx(); + bitmap.Scale(Size(nPixelX, nPixelY), BMP_SCALE_BEST); + Graphic aScaledGraphic = Graphic (bitmap); + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); + + Sequence< PropertyValue > aFilterData( 3 ); + aFilterData[ 0 ].Name = "Interlaced"; + aFilterData[ 0 ].Value <<= (sal_Int32) 0; + aFilterData[ 1 ].Name = "Compression"; + aFilterData[ 1 ].Value <<= (sal_Int32) 9; + aFilterData[ 2 ].Name = "Quality"; + aFilterData[ 2 ].Value <<= (sal_Int32) m_aMFQuality.GetValue(); + + SvMemoryStream aMemStream; + aMemStream.SetVersion( SOFFICE_FILEFORMAT_CURRENT ); + + if ( m_aLossless.IsChecked() ) + { + sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName( String( "png" ) ); + rFilter.ExportGraphic( aScaledGraphic, String("test.png"), aMemStream, nFilterFormat, &aFilterData ); + aMemStream.Seek( STREAM_SEEK_TO_END ); + aSize = aMemStream.Tell(); + } + else + { + sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName( String( "jpg" ) ); + rFilter.ExportGraphic( aScaledGraphic, String("test.jpg"), aMemStream, nFilterFormat, &aFilterData ); + aMemStream.Seek( STREAM_SEEK_TO_END ); + aSize = aMemStream.Tell(); + } + } + + if ( aSize > 0 ) + { + String aNewSizeString; + aNewSizeString += UniString::CreateFromInt32(aSize / 1024); + aNewSizeString += String( " kiB" ) ; + m_aFixedText6.SetText(aNewSizeString); + } + return 0L; +} + +Graphic CompressGraphicsDialog::GetCompressedGraphic() +{ + int aResolution = m_aResolutionLB.GetText().ToInt32(); + + if ( aResolution > 0 ) + { + long nPixelX = (long)((double) MetricField::ConvertValue( m_aViewSize100mm.Width(), 2, MAP_100TH_MM, FUNIT_INCH) / 100.0 * (double) aResolution ); + long nPixelY = (long)((double) MetricField::ConvertValue( m_aViewSize100mm.Height(), 2, MAP_100TH_MM, FUNIT_INCH) / 100.0 * (double) aResolution ); + + BitmapEx bitmap = m_aGraphic.GetBitmapEx(); + bitmap.Scale(Size(nPixelX, nPixelY), BMP_SCALE_BEST); + Graphic aScaledGraphic = Graphic (bitmap); + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); + + Sequence< PropertyValue > aFilterData( 3 ); + aFilterData[ 0 ].Name = "Interlaced"; + aFilterData[ 0 ].Value <<= (sal_Int32) 0; + aFilterData[ 1 ].Name = "Compression"; + aFilterData[ 1 ].Value <<= (sal_Int32) 9; + aFilterData[ 2 ].Name = "Quality"; + aFilterData[ 2 ].Value <<= (sal_Int32) m_aMFQuality.GetValue(); + + SvMemoryStream aMemStream; + aMemStream.SetVersion( SOFFICE_FILEFORMAT_CURRENT ); + Graphic aResultGraphic = Graphic (); + + if ( m_aLossless.IsChecked() ) + { + sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName( String( "png" ) ); + rFilter.ExportGraphic( aScaledGraphic, String("test.png"), aMemStream, nFilterFormat, &aFilterData ); + aMemStream.Seek( STREAM_SEEK_TO_BEGIN ); + rFilter.ImportGraphic( aResultGraphic, String("test.png"), aMemStream ); + } + else + { + sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName( String( "jpg" ) ); + rFilter.ExportGraphic( aScaledGraphic, String("test.jpg"), aMemStream, nFilterFormat, &aFilterData ); + aMemStream.Seek( STREAM_SEEK_TO_BEGIN ); + rFilter.ImportGraphic( aResultGraphic, String("test.jpg"), aMemStream ); + } + return aResultGraphic; + } + return m_aGraphic; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/compressgraphicdialog.hrc b/svx/source/dialog/compressgraphicdialog.hrc new file mode 100644 index 000000000000..1b94aa432376 --- /dev/null +++ b/svx/source/dialog/compressgraphicdialog.hrc @@ -0,0 +1,45 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef _COMPRESS_GRAPHICS_DIALOG_HRC +#define _COMPRESS_GRAPHICS_DIALOG_HRC + +#define FT_CG_2 2 +#define FT_CG_2_X 3 + +#define FT_CG_3 4 +#define FT_CG_3_X 5 + +#define FT_CG_4 6 +#define FT_CG_4_X 7 + +#define FT_CG_5 8 +#define FT_CG_5_X 9 + +#define FT_CG_6 10 +#define FT_CG_6_X 11 + +#define LB_CG_RESOLUTION 20 +#define MF_CG_QUALITY 21 +#define CB_CG_LOSSLESS 22 + +#define BUTTON_CG_OK 30 +#define BUTTON_CG_CANCEL 31 +#define BUTTON_CG_HELP 32 +#define BUTTON_CG_CALCULATE 33 + +#endif diff --git a/svx/source/dialog/compressgraphicdialog.src b/svx/source/dialog/compressgraphicdialog.src new file mode 100644 index 000000000000..a336fd1906fe --- /dev/null +++ b/svx/source/dialog/compressgraphicdialog.src @@ -0,0 +1,165 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <svx/dialogs.hrc> +#include "helpid.hrc" +#include "compressgraphicdialog.hrc" + +ModalDialog RID_SVXDLG_COMPRESSGRAPHICS +{ + HelpID = "svx:ModalDialog:RID_SVXDLG_COMPRESSGRAPHICS"; + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 226 , 200 ) ; + Moveable = TRUE ; + Sizeable = TRUE ; + Closeable = TRUE ; + Hide = TRUE ; + Text [ en-US ] = "Compress Graphics" ; + + FixedText FT_CG_2_X + { + Pos = MAP_APPFONT ( 6 , 8 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; + Text [ en-US ] = "Original Size:" ; + }; + + FixedText FT_CG_2 + { + Pos = MAP_APPFONT ( 56 , 8 ) ; + Size = MAP_APPFONT ( 124 , 10 ) ; + }; + + FixedText FT_CG_3_X + { + Pos = MAP_APPFONT ( 6 , 20 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; + Text [ en-US ] = "View Size:" ; + }; + + FixedText FT_CG_3 + { + Pos = MAP_APPFONT ( 56 , 20 ) ; + Size = MAP_APPFONT ( 124 , 10 ) ; + }; + + FixedText FT_CG_4_X + { + Pos = MAP_APPFONT ( 6 , 32 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; + Text [ en-US ] = "Compressed Size:" ; + }; + + FixedText FT_CG_4 + { + Pos = MAP_APPFONT ( 56 , 32 ) ; + Size = MAP_APPFONT ( 124 , 10 ) ; + }; + + FixedText FT_CG_5_X + { + Pos = MAP_APPFONT ( 6 , 44 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; + Text [ en-US ] = "Image Capacity:" ; + }; + + FixedText FT_CG_5 + { + Pos = MAP_APPFONT ( 56 , 44 ) ; + Size = MAP_APPFONT ( 124 , 10 ) ; + }; + + FixedText FT_CG_6_X + { + Pos = MAP_APPFONT ( 6 , 56 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; + Text [ en-US ] = "New Capacity:" ; + }; + + FixedText FT_CG_6 + { + Pos = MAP_APPFONT ( 56 , 56 ) ; + Size = MAP_APPFONT ( 124 , 10 ) ; + }; + + ComboBox LB_CG_RESOLUTION + { + HelpID = "sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION"; + TabStop = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 6, 68 ) ; + Size = MAP_APPFONT ( 60, 100 ) ; + DropDown = TRUE; + StringList [ en-US ] = + { + "75 DPI"; + "96 DPI"; + "150 DPI"; + "200 DPI"; + "300 DPI"; + "600 DPI"; + }; + }; + + MetricField MF_CG_QUALITY + { + Border = TRUE ; + Pos = MAP_APPFONT ( 70, 68 ) ; + Size = MAP_APPFONT ( 29 , 12 ) ; + TabStop = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Maximum = 99 ; + Last = 99 ; + SpinSize = 1 ; + Unit = FUNIT_PERCENT ; + }; + + CheckBox CB_CG_LOSSLESS + { + Pos = MAP_APPFONT ( 6 , 80 ) ; + Size = MAP_APPFONT ( 118 , 10 ) ; + Text [ en-US ] = "Lossless"; + }; + + OKButton BUTTON_CG_OK + { + Pos = MAP_APPFONT ( 170 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + DefButton = TRUE ; + }; + + CancelButton BUTTON_CG_CANCEL + { + Pos = MAP_APPFONT ( 170 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + + HelpButton BUTTON_CG_HELP + { + Pos = MAP_APPFONT ( 170 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + + PushButton BUTTON_CG_CALCULATE + { + Pos = MAP_APPFONT ( 170 , 63 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + Text [ en-US ] = "Calculate"; + }; +}; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 5d7775e90d9f..620ce3949da4 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -564,7 +564,7 @@ void SvxTPView::Resize() void SvxTPView::InsertWriterHeader() { - String aStrTab(sal_Unicode('\t')); + rtl::OUString aStrTab('\t'); String aString(aTitle1); aString+=aStrTab; aString+=aTitle3; @@ -578,7 +578,7 @@ void SvxTPView::InsertWriterHeader() void SvxTPView::InsertCalcHeader() { - String aStrTab(sal_Unicode('\t')); + rtl::OUString aStrTab('\t'); String aString(aTitle1); aString+=aStrTab; aString+=aTitle2; diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx index b8ebed52fe92..bc6f57082a56 100644 --- a/svx/source/dialog/dlgunit.hxx +++ b/svx/source/dialog/dlgunit.hxx @@ -28,6 +28,8 @@ #ifndef _SVX_DLG_DLGUNIT_HXX #define _SVX_DLG_DLGUNIT_HXX +#include <svx/svdtrans.hxx> + inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep ) { String aVal = rtl::OUString::valueOf(static_cast<sal_Int64>( diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index c9137adb9e9b..247e199a1709 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -763,12 +763,12 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) long nTextWidth = 0; if(pImpl->cStartBracket) { - String sBracket(pImpl->cStartBracket); + rtl::OUString sBracket(pImpl->cStartBracket); nStartBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); } if(pImpl->cEndBracket) { - String sBracket(pImpl->cEndBracket); + rtl::OUString sBracket(pImpl->cEndBracket); nEndBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); } nTextWidth = pImpl->CalcTextSize( this, pPrinter, aSmallFont ).Width(); @@ -785,7 +785,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if(pImpl->cStartBracket) { - String sBracket(pImpl->cStartBracket); + rtl::OUString sBracket(pImpl->cStartBracket); rFont.DrawPrev( this, pPrinter, Point( _nX, nY - nOffset - 4), sBracket ); _nX += nStartBracketWidth; } @@ -799,7 +799,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if(pImpl->cEndBracket) { Point aTmpPoint( _nX + 1, nY - nOffset - 4); - String sBracket(pImpl->cEndBracket); + rtl::OUString sBracket(pImpl->cEndBracket); rFont.DrawPrev( this, pPrinter, aTmpPoint, sBracket ); } pImpl->aCJKFont.SetSize( aOldSize ); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index bfcb51181568..09f8163bf01b 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -349,6 +349,10 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType); aStrEntry.AppendAscii(" - "); aStrEntry.Append(m_pLangTable->GetString( nRealLang )); + } else if (nRealLang == LANGUAGE_USER_SYSTEM_CONFIG) { + nRealLang = MsLangId::getSystemLanguage(); + aStrEntry.AppendAscii(" - "); + aStrEntry.Append(m_pLangTable->GetString( nRealLang )); } aStrEntry = ApplyLreOrRleEmbedding( aStrEntry ); @@ -385,6 +389,13 @@ sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nP //------------------------------------------------------------------------ +sal_uInt16 SvxLanguageBox::InsertSystemLanguage( sal_uInt16 nPos ) +{ + return ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos, ::com::sun::star::i18n::ScriptType::WEAK ); +} + +//------------------------------------------------------------------------ + sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_Bool bCheckEntry, sal_uInt16 nPos ) { diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 7305b1664f0f..7eec077c837a 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -277,7 +277,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s String sText(rtl::OUString("ABC")); Point aMove(1, GetTextHeight()); sal_Unicode cArrow = 0x2193; - long nAWidth = GetTextWidth(String(sText.GetChar(0))); + long nAWidth = GetTextWidth(rtl::OUString(sText.GetChar(0))); switch(pImpl->nFrameDirection) { case FRMDIR_HORI_LEFT_TOP: @@ -307,7 +307,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s sText.Append(cArrow); for(sal_uInt16 i = 0; i < sText.Len(); i++) { - String sDraw(sText.GetChar(i)); + rtl::OUString sDraw(sText.GetChar(i)); long nHDiff = 0; long nCharWidth = GetTextWidth(sDraw); sal_Bool bHorizontal = 0 == aMove.Y(); diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 11fedaf94cfa..df3acee8de20 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -108,7 +108,7 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText( String( sal_Unicode( '%' ) ) ); + SetCustomUnitText( rtl::OUString('%') ); SetUnit( FUNIT_CUSTOM ); } else diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 9ad1db82b843..b578b858b333 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -873,9 +873,9 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) long nSpace = ((nRightEnd - nLeftStart) - GetTextWidth(sOutputText)) / (nCount - 1); for(xub_StrLen i = 0; i < nCount; i++) { - sal_Unicode cChar = sOutputText.GetChar(i); - DrawText( Point( nLeftStart , nYOutput), cChar); - long nCharWidth = GetTextWidth(cChar); + rtl::OUString sChar(sOutputText.GetChar(i)); + DrawText( Point( nLeftStart , nYOutput), sChar); + long nCharWidth = GetTextWidth(sChar); nLeftStart += nCharWidth + nSpace; } break; diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 3ffdc0113a66..7825c6f019fc 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -176,7 +176,7 @@ void SvxSwFrameExample::InitAllRects_Impl() { aFont.SetSize(Size(0, aParaPrtArea.GetHeight() / 2)); SetFont(aFont); - aAutoCharFrame.SetSize(Size(GetTextWidth('A'), GetTextHeight())); + aAutoCharFrame.SetSize(Size(GetTextWidth(rtl::OUString('A')), GetTextHeight())); aAutoCharFrame.SetPos(Point(aParaPrtArea.Left() + (aParaPrtArea.GetWidth() - aAutoCharFrame.GetWidth()) / 2, aParaPrtArea.Top() + (aParaPrtArea.GetHeight() - aAutoCharFrame.GetHeight()) / 2)); } @@ -674,7 +674,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) aPara.Bottom() -= nDiff; } if (nAnchor == TextContentAnchorType_AT_CHARACTER && bIgnoreWrap) - DrawText(aAutoCharFrame, 'A'); + DrawText(aAutoCharFrame, rtl::OUString('A')); } else { diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 0ad52138a046..cdb9db5549c7 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -407,7 +407,7 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aRecordText.SetText(XubString(SVX_RES(RID_STR_REC_TEXT))); m_aRecordOf.SetText(XubString(SVX_RES(RID_STR_REC_FROM_TEXT))); - m_aRecordCount.SetText('?'); + m_aRecordCount.SetText(rtl::OUString('?')); m_nDefaultWidth = ArrangeControls(); diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 33a3082a90ae..59affa5eaeea 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -447,7 +447,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pModel->BegUndo(aUndoStr); } @@ -531,7 +531,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pModel->BegUndo(aUndoStr); } diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index e59f6bd83700..f9d6a85f864a 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -1002,8 +1002,8 @@ void FmSearchEngine::SearchNextImpl() UniString aTmp(strSearchExpression); const rtl::OUString s_sStar("\\*"); const rtl::OUString s_sQuotation("\\?"); - aTmp.SearchAndReplaceAll('*', s_sStar); - aTmp.SearchAndReplaceAll('?', s_sQuotation); + aTmp.SearchAndReplaceAll(rtl::OUString('*'), s_sStar); + aTmp.SearchAndReplaceAll(rtl::OUString('?'), s_sQuotation); strSearchExpression = aTmp; switch (m_nPosition) diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index b951406a8336..b6fe4ca51b1a 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -1058,7 +1058,7 @@ rtl::OUString FmUndoPropertyAction::GetComment() const RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::GetComment" ); String aStr(static_STR_UNDO_PROPERTY); - aStr.SearchAndReplace( '#', aPropertyName ); + aStr.SearchAndReplace( rtl::OUString('#'), aPropertyName ); return aStr; } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 73523525b3c0..4fea777be024 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3794,7 +3794,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent continue; String sMessage( SVX_RES( RID_ERR_FIELDREQUIRED ) ); - sMessage.SearchAndReplace( '#', rColInfo.sName ); + sMessage.SearchAndReplace( rtl::OUString('#'), rColInfo.sName ); // the control to focus Reference< XControl > xControl( rColInfo.xFirstControlWithInputRequired ); @@ -4057,7 +4057,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th if ( nLength > 1 ) { sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS ); - sTitle.SearchAndReplace( '#', String::CreateFromInt32( nLength ) ); + sTitle.SearchAndReplace( rtl::OUString('#'), rtl::OUString::valueOf(nLength) ); } else sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 47603125f0c1..da67a6146b36 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -459,7 +459,7 @@ namespace svxform { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); // der Slot war nur verfuegbar, wenn es genau einen selektierten Eintrag gibt und dieser die Root @@ -472,7 +472,7 @@ namespace svxform { XubString aStr(SVX_RES(RID_STR_CONTROL)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); // dieser Slot war guletig bei (genau) einem selektierten Formular @@ -1004,7 +1004,7 @@ namespace svxform { XubString aStr(SVX_RES(RID_STR_CONTROL)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); } diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 1d7ca0fce7fa..01bf2243d338 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -316,7 +316,7 @@ namespace svxform if( bUndo ) { XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); m_pFormModel->BegUndo(aUndoStr); } @@ -415,7 +415,7 @@ namespace svxform if( bUndo ) { XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); m_pFormModel->BegUndo(aUndoStr); } } diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 945c23f121de..f0a7b5541419 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -37,6 +37,7 @@ #include <tools/rcid.h> #include <tools/vcompat.hxx> +#include <tools/helpers.hxx> #include <vcl/virdev.hxx> #include <svl/itempool.hxx> #include <svx/fmmodel.hxx> @@ -45,7 +46,6 @@ #include "gallery.hrc" #include "svx/galmisc.hxx" #include "galobj.hxx" -#include <vcl/salbtype.hxx> // FRound #include <vcl/svapp.hxx> #include "gallerydrawmodel.hxx" diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index 51dc1a3fb543..db3295506e7d 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include <svx/sdr/overlay/overlayanimatedbitmapex.hxx> -#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index 953a405f9bc3..61ad48c8fb1f 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx @@ -28,7 +28,6 @@ #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <svx/sdr/overlay/overlaybitmapex.hxx> -#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/overlay/overlaytools.hxx> diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index 343d8b8b9c74..3dedad397f98 100644 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx @@ -19,7 +19,6 @@ #include <svx/sdr/overlay/overlaycrosshair.hxx> #include <tools/gen.hxx> -#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <svx/sdr/overlay/overlaytools.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index 16bd4f5697c7..6e0c8cac0c48 100644 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx @@ -19,7 +19,6 @@ #include <svx/sdr/overlay/overlayhelpline.hxx> #include <tools/gen.hxx> -#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <basegfx/vector/b2dvector.hxx> #include <svx/sdr/overlay/overlaytools.hxx> diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index 064c4fc7e77b..110b732cc6ab 100644 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx @@ -28,7 +28,6 @@ #include <svx/sdr/overlay/overlayline.hxx> #include <tools/gen.hxx> -#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 2bd3e51a0fcf..6182b4458703 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -30,7 +30,6 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/range/b2drange.hxx> #include <tools/gen.hxx> -#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <vcl/window.hxx> #include <svx/sdr/overlay/overlayobject.hxx> diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 933e5e97ca70..b13a1c6cdd59 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -30,7 +30,6 @@ #include <vcl/outdev.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/range/b2drange.hxx> -#include <vcl/salbtype.hxx> #include <vcl/window.hxx> #include <vcl/bitmap.hxx> #include <tools/stream.hxx> diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index e2ad9f13d9d0..b5399d6939cd 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -31,7 +31,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/vector/b2dvector.hxx> #include <vcl/outdev.hxx> -#include <vcl/salbtype.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index 5dd6c92de229..a3aa39a54cbf 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include <svx/sdr/overlay/overlaypolypolygon.hxx> -#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index 7c94256aa7bd..24a6f13f9acd 100644 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx @@ -28,7 +28,6 @@ #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <tools/gen.hxx> -#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/overlay/overlaytools.hxx> diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index e245f560b752..e2facf0154ef 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -28,7 +28,6 @@ #include <svx/sdr/overlay/overlaytriangle.hxx> #include <tools/poly.hxx> -#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index 56fd48c6ad2b..99405082abca 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -23,7 +23,7 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <tools/helpers.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 48d2de4e69bb..62df73829e6c 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -195,7 +195,7 @@ void SdrPageWindow::PrepareRedraw(const Region& rReg) #ifdef CLIPPER_TEST #include <svx/svdopath.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <tools/helpers.hxx> #include <basegfx/polygon/b2dpolygoncutandtouch.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index d62255cadac9..fd2533e16fe8 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -65,7 +65,7 @@ #include <svx/svdetc.hxx> #include <svl/itemset.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <tools/helpers.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svx/xlinjoit.hxx> diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 1e66287d8b83..74338ff25c7d 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -43,7 +43,7 @@ #include <svl/urihelper.hxx> #include <com/sun/star/uno/Sequence.h> #include <svx/svdogrp.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <tools/helpers.hxx> #include <svx/svddrag.hxx> #include <svx/xpool.hxx> #include <svx/xpoly.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index a71db0bf0fa2..8af35f0badbe 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -35,6 +35,7 @@ #include <tools/line.hxx> #include <tools/bigint.hxx> #include <tools/diagnose_ex.h> +#include <tools/helpers.hxx> #include <vector> #include <svx/svdobj.hxx> #include <svx/xpoly.hxx> @@ -87,7 +88,6 @@ #include <svx/xbtmpit.hxx> #include <svx/svdpool.hxx> #include <editeng/editeng.hxx> -#include <vcl/salbtype.hxx> // FRound #include <svl/whiter.hxx> #include <svx/fmmodel.hxx> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index eca1f620b228..4b11406aec30 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include <tools/bigint.hxx> +#include <tools/helpers.hxx> #include <svx/xlnwtit.hxx> #include <svl/style.hxx> #include <svx/svdocapt.hxx> @@ -49,7 +50,6 @@ #include <svx/xfltrit.hxx> #include <editeng/eeitem.hxx> #include <svx/sdr/properties/captionproperties.hxx> -#include <vcl/salbtype.hxx> // FRound #include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 75f71f6302ff..e03a8d0aefbb 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -30,7 +30,7 @@ #include <sfx2/lnkbase.hxx> #include <math.h> -#include <vcl/salbtype.hxx> +#include <tools/helpers.hxx> #include <sot/formats.hxx> #include <sot/storage.hxx> #include <comphelper/storagehelper.hxx> diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 25b7fa5a4d72..3ef20c8e17ed 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -28,6 +28,7 @@ #include <tools/bigint.hxx> +#include <tools/helpers.hxx> #include <svx/svdopath.hxx> #include <math.h> #include <svx/xpool.hxx> @@ -54,7 +55,6 @@ #include <svx/svdogrp.hxx> #include <svx/polypolygoneditor.hxx> #include <svx/xlntrit.hxx> -#include <vcl/salbtype.hxx> // FRound #include <svx/sdr/contact/viewcontactofsdrpathobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include "svdconv.hxx" diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 05fdbedeab54..d214f548e097 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -51,7 +51,7 @@ #include <editeng/adjitem.hxx> #include <editeng/flditem.hxx> #include <svx/xftouit.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <tools/helpers.hxx> #include <svx/xflgrit.hxx> #include <svx/svdpool.hxx> #include <svx/xflclit.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index c5046b8d4ab4..34b017dea17b 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -35,7 +35,7 @@ #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> #include <basegfx/range/b2drange.hxx> #include <editeng/editstat.hxx> -#include <vcl/salbtype.hxx> +#include <tools/helpers.hxx> #include <svx/sdtfchim.hxx> #include <svl/itemset.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 3470421ed6bd..f0935bb0ae0c 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -32,7 +32,6 @@ #include <basegfx/vector/b2dvector.hxx> #include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> #include <basegfx/range/b2drange.hxx> -#include <vcl/salbtype.hxx> #include <svl/itemset.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index cd8ba23e4176..db88eb3b6b56 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -40,6 +40,7 @@ #include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> +#include <tools/helpers.hxx> #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> @@ -59,7 +60,6 @@ #include <svx/fmdpage.hxx> #include <sfx2/objsh.hxx> -#include <vcl/salbtype.hxx> // FRound #include <svx/sdr/contact/viewcontactofsdrpage.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/displayinfo.hxx> diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index db899bde6f52..862795296d5d 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -38,7 +38,7 @@ #include <svx/svdtrans.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <tools/helpers.hxx> #include <svx/polypolygoneditor.hxx> diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 7b1db08662ac..b77f65730c6f 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -31,7 +31,6 @@ #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> -#include <vcl/salbtype.hxx> #include <vcl/canvastools.hxx> #include <vcl/hatch.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index 451b132fc232..ed5689739d0a 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -30,6 +30,7 @@ #include <tools/stream.hxx> #include <tools/debug.hxx> #include <tools/poly.hxx> +#include <tools/helpers.hxx> #include <svx/xpoly.hxx> #include "xpolyimp.hxx" @@ -37,7 +38,6 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <vcl/salbtype.hxx> // FRound #include <basegfx/range/b2drange.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/svx/util/hidother.src b/svx/util/hidother.src index 4387e1c58839..e6ba512e9123 100644 --- a/svx/util/hidother.src +++ b/svx/util/hidother.src @@ -18,9 +18,6 @@ #include "../inc/helpid.hrc" // HID_XXX #include "../inc/fmhelp.hrc" -/* #define HID_AUTOCORR_HELP_CHGNONBRKSPACE HID_AUTOCORR_HELP_START+20 */ -/* hidspecial HID_AUTOCORR_HELP_CHGNONBRKSPACE { HelpID = HID_AUTOCORR_HELP_CHGNONBRKSPACE;}; */ - hidspecial HID_FIELD_SEL { HelpID =HID_FIELD_SEL ;}; hidspecial HID_FIELD_SEL_WIN { HelpID =HID_FIELD_SEL_WIN ;}; hidspecial HID_FILL_ATTR_LISTBOX { HelpID = HID_FILL_ATTR_LISTBOX ;}; |