summaryrefslogtreecommitdiff
path: root/svx/source/toolbars
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/toolbars')
-rw-r--r--svx/source/toolbars/extrusionbar.cxx24
-rw-r--r--svx/source/toolbars/fontworkbar.cxx14
-rw-r--r--svx/source/toolbars/makefile.mk56
3 files changed, 19 insertions, 75 deletions
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 74a00bd431c6..41d4a8c824c5 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -578,7 +578,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++)
{
@@ -616,7 +616,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();
@@ -631,7 +631,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,
@@ -656,7 +656,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" ) );
@@ -807,7 +807,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" ) );
@@ -863,7 +863,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" ) );
@@ -952,7 +952,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" ) );
@@ -1004,7 +1004,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 )
@@ -1032,7 +1032,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" ) );
@@ -1113,7 +1113,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" ) );
@@ -1181,7 +1181,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" ) );
@@ -1256,7 +1256,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/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 49a4f62609a9..64367edbc85e 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -65,7 +65,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++ )
@@ -102,7 +102,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++ )
@@ -127,7 +127,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++ )
@@ -146,7 +146,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;
@@ -258,7 +258,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++)
{
@@ -526,7 +526,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() );
@@ -559,7 +559,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/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-03-22 10:52:28 +0000