summaryrefslogtreecommitdiff
path: root/svx/source/toolbars
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/toolbars')
-rwxr-xr-x[-rw-r--r--]svx/source/toolbars/extrusionbar.cxx26
-rwxr-xr-x[-rw-r--r--]svx/source/toolbars/extrusionbar.src59
-rwxr-xr-x[-rw-r--r--]svx/source/toolbars/fontworkbar.cxx22
-rwxr-xr-x[-rw-r--r--]svx/source/toolbars/fontworkbar.src34
-rw-r--r--svx/source/toolbars/makefile.mk56
5 files changed, 24 insertions, 173 deletions
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 87a8dd59a9b6..500af917b67b 100644..100755
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -47,7 +47,7 @@
#include <svx/dialogs.hrc>
#include <svx/svdview.hxx>
#include <editeng/colritem.hxx>
-#include "chrtitem.hxx"
+#include "svx/chrtitem.hxx"
#include <svx/extrusionbar.hxx>
#include "extrusiondepthdialog.hxx"
@@ -575,7 +575,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING;
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
for(i=0; i<nCount; i++)
{
@@ -613,7 +613,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)rReq.GetArgs()->GetItem(SID_ATTR_METRIC))->GetValue();
ExtrusionDepthDialog aDlg( 0L, fDepth, eUnit );
- USHORT nRet = aDlg.Execute();
+ sal_uInt16 nRet = aDlg.Execute();
if( nRet != 0 )
{
fDepth = aDlg.getDepth();
@@ -628,7 +628,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
if( nSID == SID_EXTRUSION_TOOGLE )
{
- static USHORT SidArray[] = {
+ static sal_uInt16 SidArray[] = {
SID_EXTRUSION_TILT_DOWN,
SID_EXTRUSION_TILT_UP,
SID_EXTRUSION_TILT_LEFT,
@@ -653,7 +653,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) );
@@ -804,7 +804,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) );
@@ -860,7 +860,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) );
@@ -949,7 +949,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) );
@@ -1001,7 +1001,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
if( pSdrView->GetModel() )
{
FieldUnit eUnit = pSdrView->GetModel()->GetUIUnit();
- rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (USHORT)eUnit ) );
+ rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)eUnit ) );
}
if( bHasCustomShape )
@@ -1029,7 +1029,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 )
void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) );
@@ -1110,7 +1110,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) );
@@ -1178,7 +1178,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) );
@@ -1253,7 +1253,7 @@ bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded )
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
bool bFound = false;
for(i=0;(i<nCount) && !bFound ; i++)
diff --git a/svx/source/toolbars/extrusionbar.src b/svx/source/toolbars/extrusionbar.src
index 3e6c6ad7e5cb..dd6f3066a51e 100644..100755
--- a/svx/source/toolbars/extrusionbar.src
+++ b/svx/source/toolbars/extrusionbar.src
@@ -1,65 +1,6 @@
#include <svx/svxids.hrc>
#include <svx/dialogs.hrc>
-ToolBox RID_SVX_EXTRUSION_BAR
-{
- HelpId = RID_SVX_EXTRUSION_BAR ;
- Align = BOXALIGN_BOTTOM ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_TOOGLE ;
- HelpID = SID_EXTRUSION_TOOGLE ;
- };
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_TILT_DOWN ;
- HelpID = SID_EXTRUSION_TILT_DOWN ;
- };
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_TILT_UP ;
- HelpID = SID_EXTRUSION_TILT_UP ;
- };
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_TILT_LEFT ;
- HelpID = SID_EXTRUSION_TILT_LEFT ;
- };
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_TILT_RIGHT ;
- HelpID = SID_EXTRUSION_TILT_RIGHT ;
- };
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_DEPTH_FLOATER ;
- HelpID = SID_EXTRUSION_DEPTH_FLOATER ;
- };
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_DIRECTION_FLOATER ;
- HelpID = SID_EXTRUSION_DIRECTION_FLOATER ;
- };
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_LIGHTING_FLOATER ;
- HelpID = SID_EXTRUSION_LIGHTING_FLOATER ;
- };
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_SURFACE_FLOATER ;
- HelpID = SID_EXTRUSION_SURFACE_FLOATER ;
- };
- ToolBoxItem
- {
- Identifier = SID_EXTRUSION_3D_COLOR ;
- HelpID = SID_EXTRUSION_3D_COLOR ;
- };
- };
-};
-
String RID_SVX_EXTRUSION_BAR
{
Text [ en-US ] = "Extrusion";
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index fff955499bb7..3493b187bbfd 100644..100755
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -33,7 +33,7 @@
#include <sfx2/request.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/viewsh.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
#include <svx/dialmgr.hxx>
@@ -47,11 +47,11 @@
#include <editeng/eeitem.hxx>
#include <editeng/charscaleitem.hxx>
#include <editeng/kernitem.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
#include <svx/svxids.hrc>
#include <svx/fontworkbar.hxx>
-#include "fontworkgallery.hxx"
+#include "svx/fontworkgallery.hxx"
using ::rtl::OUString;
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::uno;
void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
sal_Int32 nAlignment = -1;
for( i = 0; i < nCount; i++ )
@@ -101,7 +101,7 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
sal_Int32 nCharacterSpacing = -1;
for( i = 0; i < nCount; i++ )
@@ -126,7 +126,7 @@ void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
sal_Bool bChecked = sal_False;
for( i = 0; i < nCount; i++ )
@@ -145,7 +145,7 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
rtl::OUString aFontWorkShapeType;
@@ -257,7 +257,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
static const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
sal_Bool bFound = sal_False;
for(i=0;(i<nCount) && !bFound ; i++)
{
@@ -348,7 +348,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
}
}
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
#include <svx/fmmodel.hxx>
#include <svx/fmpage.hxx>
#include <svl/itempool.hxx>
@@ -525,7 +525,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
{
sal_Int32 nCharSpacing = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_CHARACTER_SPACING))->GetValue();
FontworkCharacterSpacingDialog aDlg( 0L, nCharSpacing );
- USHORT nRet = aDlg.Execute();
+ sal_uInt16 nRet = aDlg.Execute();
if( nRet != 0 )
{
SfxInt32Item aItem( SID_FONTWORK_CHARACTER_SPACING, aDlg.getScale() );
@@ -558,7 +558,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT;
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
for( i = 0; i < nCount; i++ )
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src
index 79279b3432db..a7bdd2cccada 100644..100755
--- a/svx/source/toolbars/fontworkbar.src
+++ b/svx/source/toolbars/fontworkbar.src
@@ -27,40 +27,6 @@
#include <svx/dialogs.hrc>
-ToolBox RID_SVX_FONTWORK_BAR
-{
- HelpId = RID_SVX_FONTWORK_BAR ;
- Align = BOXALIGN_BOTTOM ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_FONTWORK_GALLERY_FLOATER ;
- HelpID = SID_FONTWORK_GALLERY_FLOATER ;
- };
- ToolBoxItem
- {
- Identifier = SID_FONTWORK_SHAPE_TYPE ;
- HelpID = SID_FONTWORK_SHAPE_TYPE ;
- };
- ToolBoxItem
- {
- Identifier = SID_FONTWORK_SAME_LETTER_HEIGHTS ;
- HelpID = SID_FONTWORK_SAME_LETTER_HEIGHTS ;
- };
- ToolBoxItem
- {
- Identifier = SID_FONTWORK_ALIGNMENT_FLOATER ;
- HelpID = SID_FONTWORK_ALIGNMENT_FLOATER ;
- };
- ToolBoxItem
- {
- Identifier = SID_FONTWORK_CHARACTER_SPACING_FLOATER ;
- HelpID = SID_FONTWORK_CHARACTER_SPACING_FLOATER ;
- };
- };
-};
-
String RID_SVX_FONTWORK_BAR
{
Text [ en-US ] = "Fontwork";
diff --git a/svx/source/toolbars/makefile.mk b/svx/source/toolbars/makefile.mk
deleted file mode 100644
index 40c7f2ccb73e..000000000000
--- a/svx/source/toolbars/makefile.mk
+++ /dev/null
@@ -1,56 +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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=toolbars
-ENABLE_EXCEPTIONS=TRUE;
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=toolbars
-SRC1FILES = \
- extrusionbar.src \
- fontworkbar.src
-
-SLOFILES= \
- $(SLO)$/extrusionbar.obj \
- $(SLO)$/fontworkbar.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
generated by cgit (git 2.34.1) at 2025-02-04 05:24:36 +0000