[Libreoffice-commits] .: formula/inc formula/source sfx2/source svx/inc svx/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Nov 13 00:39:44 PST 2010
formula/inc/formula/funcutl.hxx | 4
formula/source/ui/dlg/formdlgs.src | 41 -----
formula/source/ui/dlg/funcutl.cxx | 8 -
formula/source/ui/dlg/parawin.cxx | 16 --
formula/source/ui/dlg/parawin.hrc | 3
formula/source/ui/dlg/parawin.src | 27 ---
formula/source/ui/inc/ForResId.hrc | 6
sfx2/source/dialog/dinfdlg.cxx | 30 ++--
svx/inc/float3d.hrc | 73 ++--------
svx/inc/svx/dialogs.hrc | 3
svx/source/dialog/ctredlin.cxx | 6
svx/source/dialog/ctredlin.hrc | 4
svx/source/dialog/ctredlin.src | 7
svx/source/engine3d/float3d.cxx | 249 +++++++++++++---------------------
svx/source/engine3d/float3d.src | 269 -------------------------------------
svx/source/fmcomp/gridctrl.cxx | 5
svx/source/tbxctrls/grafctrl.cxx | 50 +++---
17 files changed, 172 insertions(+), 629 deletions(-)
New commits:
commit 1fa6911c68eb3bd8fd922f8cb15c814f3bdcc777
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Nov 13 00:35:13 2010 -0800
Purged BmpColorMode from libs-gui - libs-core
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index aba20fd..110084d 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -78,9 +78,7 @@ class FORMULA_DLLPUBLIC RefButton : public ImageButton
{
private:
Image aImgRefStart; /// Start reference input
- Image aImgRefStartHC; /// Start reference input (high contrast)
Image aImgRefDone; /// Stop reference input
- Image aImgRefDoneHC; /// Stop reference input (high contrast)
IControlReferenceHandler* pAnyRefDlg; // parent dialog
RefEdit* pRefEdit; // zugeordnetes Edit-Control
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 626f9a0..31c99e8 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -475,15 +475,6 @@ Image RID_BMP_REFBTN1
MaskColor = STD_MASKCOLOR;
};
-Image RID_BMP_REFBTN1_H
-{
- ImageBitmap = Bitmap
- {
- File = "refinp1_h.bmp";
- };
- MaskColor = STD_MASKCOLOR;
-};
-
Image RID_BMP_REFBTN2
{
ImageBitmap = Bitmap
@@ -492,35 +483,3 @@ Image RID_BMP_REFBTN2
};
MaskColor = STD_MASKCOLOR;
};
-
-Image RID_BMP_REFBTN2_H
-{
- ImageBitmap = Bitmap
- {
- File = "refinp2_h.bmp";
- };
- MaskColor = STD_MASKCOLOR;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index e5deee9..ecff775 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -1032,9 +1032,7 @@ IMPL_LINK( RefEdit, UpdateHdl, Timer*, EMPTYARG )
RefButton::RefButton( Window* _pParent, const ResId& rResId) :
ImageButton( _pParent, rResId ),
aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
- aImgRefStartHC( ModuleRes( RID_BMP_REFBTN1_H ) ),
aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
- aImgRefDoneHC( ModuleRes( RID_BMP_REFBTN2_H ) ),
pAnyRefDlg( NULL ),
pRefEdit( NULL )
{
@@ -1044,9 +1042,7 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId) :
RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, IControlReferenceHandler* _pDlg ) :
ImageButton( _pParent, rResId ),
aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
- aImgRefStartHC( ModuleRes( RID_BMP_REFBTN1_H ) ),
aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
- aImgRefDoneHC( ModuleRes( RID_BMP_REFBTN2_H ) ),
pAnyRefDlg( _pDlg ),
pRefEdit( pEdit )
{
@@ -1056,13 +1052,11 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, ICo
void RefButton::SetStartImage()
{
SetModeImage( aImgRefStart );
- SetModeImage( aImgRefStartHC, BMP_COLOR_HIGHCONTRAST );
}
void RefButton::SetEndImage()
{
SetModeImage( aImgRefDone );
- SetModeImage( aImgRefDoneHC, BMP_COLOR_HIGHCONTRAST );
}
void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit )
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index a193750..597959d 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -41,7 +41,7 @@
#include "helpids.hrc"
#include "formula/formdata.hxx"
#include "formula/IFunctionDescription.hxx"
-#include "ModuleHelper.hxx"
+#include "ModuleHelper.hxx"
#include "ForResId.hrc"
#define VAR_ARGS 30
@@ -71,21 +71,20 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
aEdArg2 ( this, ModuleRes( ED_ARG2 ) ),
aEdArg3 ( this, ModuleRes( ED_ARG3 ) ),
aEdArg4 ( this, ModuleRes( ED_ARG4 ) ),
-
+
aRefBtn1 ( this, ModuleRes( RB_ARG1 ) ),
aRefBtn2 ( this, ModuleRes( RB_ARG2 ) ),
aRefBtn3 ( this, ModuleRes( RB_ARG3 ) ),
aRefBtn4 ( this, ModuleRes( RB_ARG4 ) ),
-
+
aSlider ( this, ModuleRes( WND_SLIDER ) ),
m_sOptional ( ModuleRes( STR_OPTIONAL ) ),
m_sRequired ( ModuleRes( STR_REQUIRED ) ),
bRefMode (FALSE)
{
- Image aFxHC( ModuleRes( IMG_FX_H ) );
FreeResource();
aDefaultString=aFtEditDesc.GetText();
-
+
SetPosPixel(aPos);
nEdFocus=NOT_FOUND;
nActiveLine=0;
@@ -95,11 +94,6 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
aSlider.SetEndScrollHdl( LINK( this, ParaWin, ScrollHdl ) );
aSlider.SetScrollHdl( LINK( this, ParaWin, ScrollHdl ) );
- aBtnFx1.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
- aBtnFx2.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
- aBtnFx3.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
- aBtnFx4.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
-
InitArgInput( 0, aFtArg1, aBtnFx1, aEdArg1, aRefBtn1);
InitArgInput( 1, aFtArg2, aBtnFx2, aEdArg2, aRefBtn2);
InitArgInput( 2, aFtArg3, aBtnFx3, aEdArg3, aRefBtn3);
diff --git a/formula/source/ui/dlg/parawin.hrc b/formula/source/ui/dlg/parawin.hrc
index 484ca53..2f8ec80 100644
--- a/formula/source/ui/dlg/parawin.hrc
+++ b/formula/source/ui/dlg/parawin.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -47,7 +47,6 @@
#define RB_ARG3 18
#define RB_ARG4 19
#define WND_SLIDER 20
-#define IMG_FX_H 30
#define STR_OPTIONAL 1
#define STR_REQUIRED 2
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index 78be770..7fff42b 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -161,29 +161,4 @@ TabPage RID_FORMULATAB_PARAMETER
{
Text [ en-US ] = "(required)" ;
};
-
- Image IMG_FX_H
- {
- ImageBitmap = Bitmap { File = "fx_h.bmp" ; };
- MaskColor = STD_MASKCOLOR;
- };
-
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
index a09e3fd..afa944f 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -55,9 +55,7 @@
// bitmap
#define RID_BMP_REFBTN1 (RID_BITMAP_START + 0)
-#define RID_BMP_REFBTN1_H (RID_BITMAP_START + 1)
#define RID_BMP_REFBTN2 (RID_BITMAP_START + 2)
-#define RID_BMP_REFBTN2_H (RID_BITMAP_START + 3)
// pages
@@ -67,8 +65,6 @@
#define RID_FORMULATAB_PARAMETER (RID_PAGE_START + 3)
#define RID_FORMULADLG_FORMULA_MODAL (RID_PAGE_START + 4)
-// misc
-
// -----------------------------------------------------------------------
#endif // FORMULA_FORRESID_HRC
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index a7553ba..1f238b3 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -1679,7 +1679,7 @@ util::Duration DurationDialog_Impl::GetDuration() const
CustomPropertiesDurationField::CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) :
Edit( pParent, rResId ), m_pLine( pLine )
-
+
{
SetDuration( util::Duration(false, 0, 0, 0, 0, 0, 0, 0) );
}
@@ -1702,8 +1702,8 @@ void CustomPropertiesDurationField::RequestHelp( const HelpEvent& rHEvt )
}
}
-void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration )
-{
+void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration )
+{
m_aDuration = rDuration;
String sText(rDuration.Negative ? '-' : '+');
sText += m_pLine->m_sDurationFormat;
@@ -1717,7 +1717,7 @@ void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration
}
CustomPropertiesEditButton::CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) :
- PushButton( pParent, rResId ), m_pLine( pLine )
+ PushButton( pParent, rResId ), m_pLine( pLine )
{
SetClickHdl( LINK( this, CustomPropertiesEditButton, ClickHdl ));
}
@@ -1769,7 +1769,7 @@ CustomPropertyLine::CustomPropertyLine( Window* pParent ) :
m_aTimeField.SetExtFormat( EXTTIMEF_24H_LONG );
m_aDateField.SetExtDateFormat( XTDATEF_SYSTEM_SHORT_YYYY );
- m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE ), BMP_COLOR_NORMAL );
+ m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE ) );
}
void CustomPropertyLine::SetRemoved()
@@ -1861,7 +1861,7 @@ IMPL_LINK( CustomPropertiesWindow, RemoveHdl, CustomPropertiesRemoveButton*, pBu
continue;
Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit,
- &pLine->m_aDateField, &pLine->m_aTimeField,
+ &pLine->m_aDateField, &pLine->m_aTimeField,
&pLine->m_aDurationField, &pLine->m_aEditButton,
&pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL };
Window** pCurrent = pWindows;
@@ -2019,8 +2019,8 @@ void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa
aSize.Width() = nWidth;
aPos.X() = aRect.getX() + ( nOffset / 2 );
m_aYesNoButton.SetPosSizePixel( aPos, aSize );
- aSize.Width() /= 2;
- aSize.Width() -= 2;
+ aSize.Width() /= 2;
+ aSize.Width() -= 2;
m_aDateField.SetPosSizePixel( aPos, aSize );
aPos.X() += aSize.Width() + 4;
m_aTimeField.SetPosSizePixel( aPos, aSize );
@@ -2059,12 +2059,12 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny )
long nPos = GetVisibleLineCount() * GetLineHeight();
m_aCustomPropertiesLines.push_back( pNewLine );
Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit,
- &m_aDateField, &m_aTimeField,
+ &m_aDateField, &m_aTimeField,
&m_aDurationField, &m_aEditButton,
&m_aYesNoButton, &m_aRemoveButton, NULL };
Window* pNewWindows[] =
{ &pNewLine->m_aNameBox, &pNewLine->m_aTypeBox, &pNewLine->m_aValueEdit,
- &pNewLine->m_aDateField, &pNewLine->m_aTimeField,
+ &pNewLine->m_aDateField, &pNewLine->m_aTimeField,
&pNewLine->m_aDurationField, &pNewLine->m_aEditButton,
&pNewLine->m_aYesNoButton, &pNewLine->m_aRemoveButton, NULL };
Window** pCurrent = pWindows;
@@ -2117,7 +2117,7 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny )
else if ( rAny >>= aTmpDate )
{
nType = CUSTOM_TYPE_DATE;
- pNewLine->m_aDateField.SetDate( Date( aTmpDate.Day, aTmpDate.Month, aTmpDate.Year ) );
+ pNewLine->m_aDateField.SetDate( Date( aTmpDate.Day, aTmpDate.Month, aTmpDate.Year ) );
}
else if ( rAny >>= aTmpDuration )
@@ -2260,14 +2260,14 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c
{
Date aTmpDate = pLine->m_aDateField.GetDate();
Time aTmpTime = pLine->m_aTimeField.GetTime();
- util::DateTime aDateTime(aTmpTime.Get100Sec(), aTmpTime.GetSec(), aTmpTime.GetMin(), aTmpTime.GetHour(),
+ util::DateTime aDateTime(aTmpTime.Get100Sec(), aTmpTime.GetSec(), aTmpTime.GetMin(), aTmpTime.GetHour(),
aTmpDate.GetDay(), aTmpDate.GetMonth(), aTmpDate.GetYear() );
aPropertiesSeq[i].Value <<= aDateTime;
- }
+ }
else if ( CUSTOM_TYPE_DURATION == nType )
{
aPropertiesSeq[i].Value <<= pLine->m_aDurationField.GetDuration();
- }
+ }
else if ( CUSTOM_TYPE_DATE == nType )
{
Date aTmpDate = pLine->m_aDateField.GetDate();
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index 472cd24..1885678 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -26,8 +26,6 @@
************************************************************************/
#include <svx/dialogs.hrc>
-//#define FLT_WIN_3D 827
-
#define BTN_GEO 2
#define BTN_REPRESENTATION 3
#define BTN_LIGHT 4
@@ -43,12 +41,12 @@
#define CTL_PREVIEW 12
#define CTL_LIGHT_PREVIEW 13
-// Geometrie
+// Geomerty
#define FT_HORIZONTAL 24
#define NUM_HORIZONTAL 25
#define FT_VERTICAL 26
#define NUM_VERTICAL 27
-#define FL_SEGMENTS 28
+#define FL_SEGMENTS 28
#define FT_PERCENT_DIAGONAL 29
#define MTR_PERCENT_DIAGONAL 30
#define FT_BACKSCALE 31
@@ -57,32 +55,32 @@
#define MTR_END_ANGLE 34
#define FT_DEPTH 35
#define MTR_DEPTH 36
-#define FL_GEOMETRIE 37
+#define FL_GEOMETRIE 37
#define BTN_NORMALS_OBJ 38
#define BTN_NORMALS_FLAT 39
#define BTN_NORMALS_SPHERE 40
#define BTN_TWO_SIDED_LIGHTING 41
#define BTN_NORMALS_INVERT 42
-#define FL_NORMALS 43
+#define FL_NORMALS 43
#define BTN_DOUBLE_SIDED 44
-// Darstellung
+// Depiction/Appearance
#define FT_SHADEMODE 45
#define LB_SHADEMODE 46
#define BTN_SHADOW_3D 47
#define FT_SLANT 48
#define MTR_SLANT 49
-#define FL_SHADOW 50
+#define FL_SHADOW 50
#define FT_DISTANCE 51
#define MTR_DISTANCE 52
#define FT_FOCAL_LENGTH 53
#define MTR_FOCAL_LENGTH 54
-#define FL_CAMERA 55
-#define FL_REPRESENTATION 56
+#define FL_CAMERA 55
+#define FL_REPRESENTATION 56
-// Beleuchtung
+// Lighting
#define BTN_LIGHT_1 60
#define BTN_LIGHT_2 61
#define BTN_LIGHT_3 62
@@ -100,11 +98,11 @@
#define LB_LIGHT_7 74
#define LB_LIGHT_8 75
#define BTN_LIGHT_COLOR 76
-#define FT_LIGHTSOURCE 77
+#define FT_LIGHTSOURCE 77
#define LB_AMBIENTLIGHT 78
#define BTN_AMBIENT_COLOR 79
-#define FT_AMBIENTLIGHT 80
-#define FL_LIGHT 81
+#define FT_AMBIENTLIGHT 80
+#define FL_LIGHT 81
// Textures
#define FT_TEX_KIND 90
@@ -124,11 +122,10 @@
#define BTN_TEX_OBJECT_Y 104
#define FT_TEX_FILTER 105
#define BTN_TEX_FILTER 106
-#define FL_TEXTURE 107
+#define FL_TEXTURE 107
// Material
-//#define CTL_MATERIAL 110
-#define FL_MATERIAL 111
+#define FL_MATERIAL 111
#define FT_MAT_COLOR 112
#define LB_MAT_COLOR 113
@@ -141,44 +138,6 @@
#define BTN_SPECULAR_COLOR 120
#define FT_MAT_SPECULAR_INTENSITY 121
#define MTR_MAT_SPECULAR_INTENSITY 122
-#define FL_MAT_SPECULAR 123
+#define FL_MAT_SPECULAR 123
#define FT_MAT_FAVORITES 124
#define LB_MAT_FAVORITES 125
-
-
-//#define BTN_MAT_FAVORITES 125
-//#define BTN_MAT_EDITOR 126
-
-
-// high contrast
-#define BMP_GEO_H 130
-#define BMP_REPRESENTATION_H 131
-#define BMP_LIGHT_H 132
-#define BMP_TEXTURE_H 133
-#define BMP_MATERIAL_H 134
-#define BMP_UPDATE_H 135
-#define BMP_ASSIGN_H 136
-#define BMP_CHANGE_TO_3D_H 137
-#define BMP_LATHE_OBJ_H 138
-#define BMP_PERSPECTIVE_H 139
-#define BMP_NORMALS_OBJ_H 142
-#define BMP_NORMALS_FLAT_H 143
-#define BMP_NORMALS_SPHERE_H 144
-#define BMP_NORMALS_INVERT_H 145
-#define BMP_TWO_SIDED_LIGHTING_H 146
-#define BMP_DOUBLE_SIDED_H 147
-#define BMP_SHADOW_3D_H 148
-#define BMP_3DLIGHT_H 149
-#define BMP_LIGHT_COLOR_H 150
-#define BMP_AMBIENT_COLOR_H 151
-#define BMP_TEX_LUMINANCE_H 152
-#define BMP_TEX_COLOR_H 153
-#define BMP_TEX_REPLACE_H 154
-#define BMP_TEX_MODULATE_H 155
-#define BMP_TEX_BLEND_H 156
-#define BMP_TEX_OBJECT_H 157
-#define BMP_TEX_PARALLEL_H 158
-#define BMP_TEX_CIRCLE_H 159
-#define BMP_TEX_FILTER_H 160
-#define BMP_COLORDLG_H 161
-
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 3a3b391..84d1032 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -188,10 +188,7 @@
#define RID_SVXIMAGE_LIGHT_ON (RID_SVX_START + 210)
#define RID_SVXIMAGE_LIGHT_OFF (RID_SVX_START + 211)
-#define RID_SVXIMAGE_LIGHT_ON_H (RID_SVX_START + 212)
-#define RID_SVXIMAGE_LIGHT_OFF_H (RID_SVX_START + 213)
#define RID_SVXIMAGE_COLORDLG (RID_SVX_START + 214)
-#define RID_SVXIMAGE_COLORDLG_H (RID_SVX_START + 215)
#define RID_SVXFLOAT3D_FAVORITE (RID_SVX_START + 73)
#define RID_SVXFLOAT3D_FIX_X (RID_SVX_START + 74)
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 47c9c10..d66c2c9 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -827,12 +827,8 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
aStrMyName ( SVX_RES( STR_FILTER) ),
bModified (FALSE)
{
- Image aImgTimeHC( SVX_RES( IMG_TIME_H ) );
FreeResource();
- aIbClock.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST );
- aIbClock2.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST );
-
aDfDate.SetShowDateCentury( TRUE );
aDfDate2.SetShowDateCentury( TRUE );
diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc
index cba699d..af7f8d0 100644
--- a/svx/source/dialog/ctredlin.hrc
+++ b/svx/source/dialog/ctredlin.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -50,7 +50,6 @@
#define LB_ACTION 18
#define CB_COMMENT 19
#define ED_COMMENT 20
-#define IMG_TIME_H 30
#define HG_VIEW 1
#define DG_VIEW 2
@@ -67,4 +66,3 @@
#define STR_TITLE4 4
#define STR_TITLE5 5
//
-
diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index 3ca9f10..ab82e92 100644
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -249,11 +249,6 @@ TabPage SID_REDLIN_FILTER_PAGE
Size = MAP_APPFONT ( 178 , 12 ) ;
TabStop = TRUE ;
};
- Image IMG_TIME_H
- {
- ImageBitmap = Bitmap { File = "time_h.bmp" ; };
- MASKCOLOR
- };
};
TabPage SID_REDLIN_VIEW_PAGE
{
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index c71aa59..d0d6777 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -73,17 +73,8 @@ SFX_IMPL_DOCKINGWINDOW( Svx3DChildWindow, SID_3D_WIN )
struct Svx3DWinImpl
{
SfxItemPool* pPool;
- Image maImgLightOnH;
- Image maImgLightOffH;
};
-#define SETHCIMAGE(btn,res) \
-{ \
- Bitmap aBmp( SVX_RES( res ) ); \
- Image aImage( aBmp, COL_LIGHTMAGENTA ); \
- btn.SetModeImage( aImage, BMP_COLOR_HIGHCONTRAST ); \
-}
-
namespace {
/** Get the dispatcher from the current view frame, or, if that is not
available, from the given bindings.
@@ -95,7 +86,7 @@ namespace {
SfxDispatcher* LocalGetDispatcher (const SfxBindings* pBindings)
{
SfxDispatcher* pDispatcher = NULL;
-
+
if (SfxViewFrame::Current() != NULL)
pDispatcher = SfxViewFrame::Current()->GetDispatcher();
else if (pBindings != NULL)
@@ -113,115 +104,115 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
SfxChildWindow *pCW, Window* pParent ) :
SfxDockingWindow ( pInBindings, pCW, pParent,
SVX_RES( RID_SVXFLOAT_3D ) ),
- aBtnGeo ( this, SVX_RES( BTN_GEO ) ),
- aBtnRepresentation ( this, SVX_RES( BTN_REPRESENTATION ) ),
- aBtnLight ( this, SVX_RES( BTN_LIGHT ) ),
- aBtnTexture ( this, SVX_RES( BTN_TEXTURE ) ),
- aBtnMaterial ( this, SVX_RES( BTN_MATERIAL ) ),
- aBtnUpdate ( this, SVX_RES( BTN_UPDATE ) ),
- aBtnAssign ( this, SVX_RES( BTN_ASSIGN ) ),
+ aBtnGeo ( this, SVX_RES( BTN_GEO ) ),
+ aBtnRepresentation ( this, SVX_RES( BTN_REPRESENTATION ) ),
+ aBtnLight ( this, SVX_RES( BTN_LIGHT ) ),
+ aBtnTexture ( this, SVX_RES( BTN_TEXTURE ) ),
+ aBtnMaterial ( this, SVX_RES( BTN_MATERIAL ) ),
+ aBtnUpdate ( this, SVX_RES( BTN_UPDATE ) ),
+ aBtnAssign ( this, SVX_RES( BTN_ASSIGN ) ),
// Geometrie
- aFtPercentDiagonal ( this, SVX_RES( FT_PERCENT_DIAGONAL ) ),
- aMtrPercentDiagonal ( this, SVX_RES( MTR_PERCENT_DIAGONAL ) ),
- aFtBackscale ( this, SVX_RES( FT_BACKSCALE ) ),
- aMtrBackscale ( this, SVX_RES( MTR_BACKSCALE ) ),
- aFtEndAngle ( this, SVX_RES( FT_END_ANGLE ) ),
- aMtrEndAngle ( this, SVX_RES( MTR_END_ANGLE ) ),
- aFtDepth ( this, SVX_RES( FT_DEPTH ) ),
- aMtrDepth ( this, SVX_RES( MTR_DEPTH ) ),
- aFLGeometrie ( this, SVX_RES( FL_GEOMETRIE ) ),
-
- aFtHorizontal ( this, SVX_RES( FT_HORIZONTAL ) ),
- aNumHorizontal ( this, SVX_RES( NUM_HORIZONTAL ) ),
- aFtVertical ( this, SVX_RES( FT_VERTICAL ) ),
- aNumVertical ( this, SVX_RES( NUM_VERTICAL ) ),
- aFLSegments ( this, SVX_RES( FL_SEGMENTS ) ),
-
- aBtnNormalsObj ( this, SVX_RES( BTN_NORMALS_OBJ ) ),
- aBtnNormalsFlat ( this, SVX_RES( BTN_NORMALS_FLAT ) ),
- aBtnNormalsSphere ( this, SVX_RES( BTN_NORMALS_SPHERE ) ),
- aBtnNormalsInvert ( this, SVX_RES( BTN_NORMALS_INVERT ) ),
+ aFtPercentDiagonal ( this, SVX_RES( FT_PERCENT_DIAGONAL ) ),
+ aMtrPercentDiagonal ( this, SVX_RES( MTR_PERCENT_DIAGONAL ) ),
+ aFtBackscale ( this, SVX_RES( FT_BACKSCALE ) ),
+ aMtrBackscale ( this, SVX_RES( MTR_BACKSCALE ) ),
+ aFtEndAngle ( this, SVX_RES( FT_END_ANGLE ) ),
+ aMtrEndAngle ( this, SVX_RES( MTR_END_ANGLE ) ),
+ aFtDepth ( this, SVX_RES( FT_DEPTH ) ),
+ aMtrDepth ( this, SVX_RES( MTR_DEPTH ) ),
+ aFLGeometrie ( this, SVX_RES( FL_GEOMETRIE ) ),
+
+ aFtHorizontal ( this, SVX_RES( FT_HORIZONTAL ) ),
+ aNumHorizontal ( this, SVX_RES( NUM_HORIZONTAL ) ),
+ aFtVertical ( this, SVX_RES( FT_VERTICAL ) ),
+ aNumVertical ( this, SVX_RES( NUM_VERTICAL ) ),
+ aFLSegments ( this, SVX_RES( FL_SEGMENTS ) ),
+
+ aBtnNormalsObj ( this, SVX_RES( BTN_NORMALS_OBJ ) ),
+ aBtnNormalsFlat ( this, SVX_RES( BTN_NORMALS_FLAT ) ),
+ aBtnNormalsSphere ( this, SVX_RES( BTN_NORMALS_SPHERE ) ),
+ aBtnNormalsInvert ( this, SVX_RES( BTN_NORMALS_INVERT ) ),
aBtnTwoSidedLighting( this, SVX_RES( BTN_TWO_SIDED_LIGHTING ) ),
- aFLNormals ( this, SVX_RES( FL_NORMALS ) ),
+ aFLNormals ( this, SVX_RES( FL_NORMALS ) ),
aBtnDoubleSided ( this, SVX_RES( BTN_DOUBLE_SIDED ) ),
// Darstellung
- aFtShademode ( this, SVX_RES( FT_SHADEMODE ) ),
- aLbShademode ( this, SVX_RES( LB_SHADEMODE ) ),
- aBtnShadow3d ( this, SVX_RES( BTN_SHADOW_3D ) ),
- aFtSlant ( this, SVX_RES( FT_SLANT ) ),
- aMtrSlant ( this, SVX_RES( MTR_SLANT ) ),
- aFLShadow ( this, SVX_RES( FL_SHADOW ) ),
- aFtDistance ( this, SVX_RES( FT_DISTANCE ) ),
- aMtrDistance ( this, SVX_RES( MTR_DISTANCE ) ),
- aFtFocalLeng ( this, SVX_RES( FT_FOCAL_LENGTH ) ),
- aMtrFocalLength ( this, SVX_RES( MTR_FOCAL_LENGTH ) ),
- aFLCamera ( this, SVX_RES( FL_CAMERA ) ),
- aFLRepresentation ( this, SVX_RES( FL_REPRESENTATION ) ),
+ aFtShademode ( this, SVX_RES( FT_SHADEMODE ) ),
+ aLbShademode ( this, SVX_RES( LB_SHADEMODE ) ),
+ aBtnShadow3d ( this, SVX_RES( BTN_SHADOW_3D ) ),
+ aFtSlant ( this, SVX_RES( FT_SLANT ) ),
+ aMtrSlant ( this, SVX_RES( MTR_SLANT ) ),
+ aFLShadow ( this, SVX_RES( FL_SHADOW ) ),
+ aFtDistance ( this, SVX_RES( FT_DISTANCE ) ),
+ aMtrDistance ( this, SVX_RES( MTR_DISTANCE ) ),
+ aFtFocalLeng ( this, SVX_RES( FT_FOCAL_LENGTH ) ),
+ aMtrFocalLength ( this, SVX_RES( MTR_FOCAL_LENGTH ) ),
+ aFLCamera ( this, SVX_RES( FL_CAMERA ) ),
+ aFLRepresentation ( this, SVX_RES( FL_REPRESENTATION ) ),
// Beleuchtung
- aBtnLight1 ( this, SVX_RES( BTN_LIGHT_1 ) ),
- aBtnLight2 ( this, SVX_RES( BTN_LIGHT_2 ) ),
- aBtnLight3 ( this, SVX_RES( BTN_LIGHT_3 ) ),
- aBtnLight4 ( this, SVX_RES( BTN_LIGHT_4 ) ),
- aBtnLight5 ( this, SVX_RES( BTN_LIGHT_5 ) ),
- aBtnLight6 ( this, SVX_RES( BTN_LIGHT_6 ) ),
- aBtnLight7 ( this, SVX_RES( BTN_LIGHT_7 ) ),
- aBtnLight8 ( this, SVX_RES( BTN_LIGHT_8 ) ),
- aLbLight1 ( this, SVX_RES( LB_LIGHT_1 ) ),
- aLbLight2 ( this, SVX_RES( LB_LIGHT_2 ) ),
- aLbLight3 ( this, SVX_RES( LB_LIGHT_3 ) ),
- aLbLight4 ( this, SVX_RES( LB_LIGHT_4 ) ),
- aLbLight5 ( this, SVX_RES( LB_LIGHT_5 ) ),
- aLbLight6 ( this, SVX_RES( LB_LIGHT_6 ) ),
- aLbLight7 ( this, SVX_RES( LB_LIGHT_7 ) ),
- aLbLight8 ( this, SVX_RES( LB_LIGHT_8 ) ),
-
- aBtnLightColor ( this, SVX_RES( BTN_LIGHT_COLOR ) ),
- aFTLightsource ( this, SVX_RES( FT_LIGHTSOURCE ) ),
+ aBtnLight1 ( this, SVX_RES( BTN_LIGHT_1 ) ),
+ aBtnLight2 ( this, SVX_RES( BTN_LIGHT_2 ) ),
+ aBtnLight3 ( this, SVX_RES( BTN_LIGHT_3 ) ),
+ aBtnLight4 ( this, SVX_RES( BTN_LIGHT_4 ) ),
+ aBtnLight5 ( this, SVX_RES( BTN_LIGHT_5 ) ),
+ aBtnLight6 ( this, SVX_RES( BTN_LIGHT_6 ) ),
+ aBtnLight7 ( this, SVX_RES( BTN_LIGHT_7 ) ),
+ aBtnLight8 ( this, SVX_RES( BTN_LIGHT_8 ) ),
+ aLbLight1 ( this, SVX_RES( LB_LIGHT_1 ) ),
+ aLbLight2 ( this, SVX_RES( LB_LIGHT_2 ) ),
+ aLbLight3 ( this, SVX_RES( LB_LIGHT_3 ) ),
+ aLbLight4 ( this, SVX_RES( LB_LIGHT_4 ) ),
+ aLbLight5 ( this, SVX_RES( LB_LIGHT_5 ) ),
+ aLbLight6 ( this, SVX_RES( LB_LIGHT_6 ) ),
+ aLbLight7 ( this, SVX_RES( LB_LIGHT_7 ) ),
+ aLbLight8 ( this, SVX_RES( LB_LIGHT_8 ) ),
+
+ aBtnLightColor ( this, SVX_RES( BTN_LIGHT_COLOR ) ),
+ aFTLightsource ( this, SVX_RES( FT_LIGHTSOURCE ) ),
// #99694# Keyboard shortcuts activate the next control, so the
// order needed to be changed here
- aFTAmbientlight ( this, SVX_RES( FT_AMBIENTLIGHT ) ), // Text label
- aLbAmbientlight ( this, SVX_RES( LB_AMBIENTLIGHT ) ), // ListBox
- aBtnAmbientColor ( this, SVX_RES( BTN_AMBIENT_COLOR ) ), // color button
-
- aFLLight ( this, SVX_RES( FL_LIGHT ) ),
+ aFTAmbientlight ( this, SVX_RES( FT_AMBIENTLIGHT ) ), // Text label
+ aLbAmbientlight ( this, SVX_RES( LB_AMBIENTLIGHT ) ), // ListBox
+ aBtnAmbientColor ( this, SVX_RES( BTN_AMBIENT_COLOR ) ), // color button
+
+ aFLLight ( this, SVX_RES( FL_LIGHT ) ),
// Textures
- aFtTexKind ( this, SVX_RES( FT_TEX_KIND ) ),
- aBtnTexLuminance ( this, SVX_RES( BTN_TEX_LUMINANCE ) ),
- aBtnTexColor ( this, SVX_RES( BTN_TEX_COLOR ) ),
- aFtTexMode ( this, SVX_RES( FT_TEX_MODE ) ),
- aBtnTexReplace ( this, SVX_RES( BTN_TEX_REPLACE ) ),
- aBtnTexModulate ( this, SVX_RES( BTN_TEX_MODULATE ) ),
- aBtnTexBlend ( this, SVX_RES( BTN_TEX_BLEND ) ),
- aFtTexProjectionX ( this, SVX_RES( FT_TEX_PROJECTION_X ) ),
- aBtnTexObjectX ( this, SVX_RES( BTN_TEX_OBJECT_X ) ),
- aBtnTexParallelX ( this, SVX_RES( BTN_TEX_PARALLEL_X ) ),
- aBtnTexCircleX ( this, SVX_RES( BTN_TEX_CIRCLE_X ) ),
- aFtTexProjectionY ( this, SVX_RES( FT_TEX_PROJECTION_Y ) ),
- aBtnTexObjectY ( this, SVX_RES( BTN_TEX_OBJECT_Y ) ),
- aBtnTexParallelY ( this, SVX_RES( BTN_TEX_PARALLEL_Y ) ),
- aBtnTexCircleY ( this, SVX_RES( BTN_TEX_CIRCLE_Y ) ),
- aFtTexFilter ( this, SVX_RES( FT_TEX_FILTER ) ),
- aBtnTexFilter ( this, SVX_RES( BTN_TEX_FILTER ) ),
- aFLTexture ( this, SVX_RES( FL_TEXTURE ) ),
+ aFtTexKind ( this, SVX_RES( FT_TEX_KIND ) ),
+ aBtnTexLuminance ( this, SVX_RES( BTN_TEX_LUMINANCE ) ),
+ aBtnTexColor ( this, SVX_RES( BTN_TEX_COLOR ) ),
+ aFtTexMode ( this, SVX_RES( FT_TEX_MODE ) ),
+ aBtnTexReplace ( this, SVX_RES( BTN_TEX_REPLACE ) ),
+ aBtnTexModulate ( this, SVX_RES( BTN_TEX_MODULATE ) ),
+ aBtnTexBlend ( this, SVX_RES( BTN_TEX_BLEND ) ),
+ aFtTexProjectionX ( this, SVX_RES( FT_TEX_PROJECTION_X ) ),
+ aBtnTexObjectX ( this, SVX_RES( BTN_TEX_OBJECT_X ) ),
+ aBtnTexParallelX ( this, SVX_RES( BTN_TEX_PARALLEL_X ) ),
+ aBtnTexCircleX ( this, SVX_RES( BTN_TEX_CIRCLE_X ) ),
+ aFtTexProjectionY ( this, SVX_RES( FT_TEX_PROJECTION_Y ) ),
+ aBtnTexObjectY ( this, SVX_RES( BTN_TEX_OBJECT_Y ) ),
+ aBtnTexParallelY ( this, SVX_RES( BTN_TEX_PARALLEL_Y ) ),
+ aBtnTexCircleY ( this, SVX_RES( BTN_TEX_CIRCLE_Y ) ),
+ aFtTexFilter ( this, SVX_RES( FT_TEX_FILTER ) ),
+ aBtnTexFilter ( this, SVX_RES( BTN_TEX_FILTER ) ),
+ aFLTexture ( this, SVX_RES( FL_TEXTURE ) ),
// Material
- aFtMatFavorites ( this, SVX_RES( FT_MAT_FAVORITES ) ),
- aLbMatFavorites ( this, SVX_RES( LB_MAT_FAVORITES ) ),
- aFtMatColor ( this, SVX_RES( FT_MAT_COLOR ) ),
- aLbMatColor ( this, SVX_RES( LB_MAT_COLOR ) ),
- aBtnMatColor ( this, SVX_RES( BTN_MAT_COLOR ) ),
- aFtMatEmission ( this, SVX_RES( FT_MAT_EMISSION ) ),
- aLbMatEmission ( this, SVX_RES( LB_MAT_EMISSION ) ),
- aBtnEmissionColor ( this, SVX_RES( BTN_EMISSION_COLOR ) ),
- aFtMatSpecular ( this, SVX_RES( FT_MAT_SPECULAR ) ),
- aLbMatSpecular ( this, SVX_RES( LB_MAT_SPECULAR ) ),
- aBtnSpecularColor ( this, SVX_RES( BTN_SPECULAR_COLOR ) ),
+ aFtMatFavorites ( this, SVX_RES( FT_MAT_FAVORITES ) ),
+ aLbMatFavorites ( this, SVX_RES( LB_MAT_FAVORITES ) ),
+ aFtMatColor ( this, SVX_RES( FT_MAT_COLOR ) ),
+ aLbMatColor ( this, SVX_RES( LB_MAT_COLOR ) ),
+ aBtnMatColor ( this, SVX_RES( BTN_MAT_COLOR ) ),
+ aFtMatEmission ( this, SVX_RES( FT_MAT_EMISSION ) ),
+ aLbMatEmission ( this, SVX_RES( LB_MAT_EMISSION ) ),
+ aBtnEmissionColor ( this, SVX_RES( BTN_EMISSION_COLOR ) ),
+ aFtMatSpecular ( this, SVX_RES( FT_MAT_SPECULAR ) ),
+ aLbMatSpecular ( this, SVX_RES( LB_MAT_SPECULAR ) ),
+ aBtnSpecularColor ( this, SVX_RES( BTN_SPECULAR_COLOR ) ),
aFtMatSpecularIntensity( this, SVX_RES( FT_MAT_SPECULAR_INTENSITY ) ),
aMtrMatSpecularIntensity( this, SVX_RES( MTR_MAT_SPECULAR_INTENSITY ) ),
aFLMatSpecular ( this, SVX_RES( FL_MAT_SPECULAR ) ),
@@ -251,57 +242,11 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
pControllerItem(0L),
pConvertTo3DItem(0L),
pConvertTo3DLatheItem(0L),
-// pPool ( NULL ),
mpImpl ( new Svx3DWinImpl() ),
mpRemember2DAttributes(NULL),
bOnly3DChanged ( FALSE )
{
- SETHCIMAGE( aBtnGeo, BMP_GEO_H );
- SETHCIMAGE( aBtnRepresentation, BMP_REPRESENTATION_H );
- SETHCIMAGE( aBtnLight, BMP_3DLIGHT_H );
- SETHCIMAGE( aBtnTexture, BMP_TEXTURE_H );
- SETHCIMAGE( aBtnMaterial, BMP_MATERIAL_H );
- SETHCIMAGE( aBtnUpdate, BMP_UPDATE_H );
- SETHCIMAGE( aBtnAssign, BMP_ASSIGN_H );
- SETHCIMAGE( aBtnNormalsObj, BMP_NORMALS_OBJ_H );
- SETHCIMAGE( aBtnNormalsFlat, BMP_NORMALS_FLAT_H );
- SETHCIMAGE( aBtnNormalsSphere, BMP_NORMALS_SPHERE_H );
- SETHCIMAGE( aBtnTwoSidedLighting, BMP_TWO_SIDED_LIGHTING_H );
- SETHCIMAGE( aBtnNormalsInvert, BMP_NORMALS_INVERT_H );
- SETHCIMAGE( aBtnDoubleSided, BMP_DOUBLE_SIDED_H );
- SETHCIMAGE( aBtnShadow3d, BMP_SHADOW_3D_H );
- SETHCIMAGE( aBtnLight1, BMP_LIGHT_H );
- SETHCIMAGE( aBtnLight2, BMP_LIGHT_H );
- SETHCIMAGE( aBtnLight3, BMP_LIGHT_H );
- SETHCIMAGE( aBtnLight4, BMP_LIGHT_H );
- SETHCIMAGE( aBtnLight5, BMP_LIGHT_H );
- SETHCIMAGE( aBtnLight6, BMP_LIGHT_H );
- SETHCIMAGE( aBtnLight7, BMP_LIGHT_H );
- SETHCIMAGE( aBtnLight8, BMP_LIGHT_H );
- SETHCIMAGE( aBtnLightColor, BMP_LIGHT_COLOR_H );
- SETHCIMAGE( aBtnAmbientColor, BMP_AMBIENT_COLOR_H );
- SETHCIMAGE( aBtnTexLuminance, BMP_TEX_LUMINANCE_H );
- SETHCIMAGE( aBtnTexColor, BMP_TEX_COLOR_H );
- SETHCIMAGE( aBtnTexReplace, BMP_TEX_REPLACE_H );
- SETHCIMAGE( aBtnTexModulate, BMP_TEX_MODULATE_H );
- SETHCIMAGE( aBtnTexBlend, BMP_TEX_BLEND_H );
- SETHCIMAGE( aBtnTexParallelX, BMP_TEX_PARALLEL_H );
- SETHCIMAGE( aBtnTexCircleX, BMP_TEX_CIRCLE_H );
- SETHCIMAGE( aBtnTexObjectX, BMP_TEX_OBJECT_H );
- SETHCIMAGE( aBtnTexParallelY, BMP_TEX_PARALLEL_H );
- SETHCIMAGE( aBtnTexCircleY, BMP_TEX_CIRCLE_H );
- SETHCIMAGE( aBtnTexObjectY, BMP_TEX_OBJECT_H );
- SETHCIMAGE( aBtnTexFilter, BMP_TEX_FILTER_H );
- SETHCIMAGE( aBtnMatColor, BMP_COLORDLG_H );
- SETHCIMAGE( aBtnEmissionColor, BMP_COLORDLG_H );
- SETHCIMAGE( aBtnSpecularColor, BMP_COLORDLG_H );
- SETHCIMAGE( aBtnPerspective, BMP_PERSPECTIVE_H );
- SETHCIMAGE( aBtnConvertTo3D, BMP_CHANGE_TO_3D_H );
- SETHCIMAGE( aBtnLatheObject, BMP_LATHE_OBJ_H );
-
mpImpl->pPool = NULL;
- mpImpl->maImgLightOnH = Image( SVX_RES( RID_SVXIMAGE_LIGHT_ON_H ) );
- mpImpl->maImgLightOffH = Image( SVX_RES( RID_SVXIMAGE_LIGHT_OFF_H ) );
FreeResource();
// Metrik einstellen
@@ -462,13 +407,12 @@ void Svx3DWin::Reset()
bool Svx3DWin::GetUILightState( ImageButton& aBtn ) const
{
- return (aBtn.GetModeImage() == aImgLightOn) || (aBtn.GetModeImage() == mpImpl->maImgLightOnH);
+ return (aBtn.GetModeImage() == aImgLightOn);
}
void Svx3DWin::SetUILightState( ImageButton& aBtn, bool bState )
{
aBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff );
- aBtn.SetModeImage( bState ? mpImpl->maImgLightOnH : mpImpl->maImgLightOffH, BMP_COLOR_HIGHCONTRAST );
}
// -----------------------------------------------------------------------
@@ -499,7 +443,6 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
// construct field values
const SfxPoolItem* pItem;
- //BOOL bUpdate = FALSE;
// evtl. PoolUnit ermitteln
if( !mpImpl->pPool )
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index 1f77b7f..fe559a4 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -965,16 +965,6 @@ DockingWindow RID_SVXFLOAT_3D
Text [ en-US ] = "Textures" ;
};
// Material
- /* Control CTL_MATERIAL
- {
- //HelpId = HID_SD_CTL_FAVORITES ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( BORDER + 6 , GROUP_Y + 9 ) ;
- Size = MAP_APPFONT ( GROUP_WIDTH - 12 , GROUP_HEIGHT - 15 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
- };
-*/
// Materialeditor
FixedText FT_MAT_FAVORITES
{
@@ -1112,30 +1102,6 @@ DockingWindow RID_SVXFLOAT_3D
Last = 100 ;
SpinSize = 1 ;
};
- /*
- ImageButton BTN_MAT_FAVORITES {
- Pos = MAP_APPFONT( BORDER, GROUP_PREV_Y+1 );
- Size = IMG_BUTTON_SIZE;
- QuickHelpText = "Material Favoriten" ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap { File = "matfavor.bmp" ; };
- MASKCOLOR
- };
- TabStop = TRUE;
- };
- ImageButton BTN_MAT_EDITOR {
- Pos = MAP_APPFONT( BORDER + BUTTON_WIDTH, GROUP_PREV_Y+1 );
- Size = IMG_BUTTON_SIZE;
- QuickHelpText = "Material Editor" ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap { File = "matedit.bmp" ; };
- MASKCOLOR
- };
- TabStop = TRUE;
- };
-*/
FixedLine FL_MATERIAL
{
Pos = TOP_FIXED_LINE_POS;
@@ -1143,155 +1109,6 @@ DockingWindow RID_SVXFLOAT_3D
Text [ en-US ] = "Material" ;
};
- Bitmap BMP_GEO_H
- {
- File = "3dgeo_h.bmp";
- };
-
- Bitmap BMP_REPRESENTATION_H
- {
- File = "3drepres_h.bmp";
- };
-
- Bitmap BMP_3DLIGHT_H
- {
- File = "3dlight_h.bmp";
- };
-
- Bitmap BMP_TEXTURE_H
- {
- File = "3dtextur_h.bmp";
- };
-
- Bitmap BMP_MATERIAL_H
- {
- File = "material_h.bmp";
- };
-
- Bitmap BMP_UPDATE_H
- {
- File = "sc10350_h.bmp";
- };
-
- Bitmap BMP_ASSIGN_H
- {
- File = "apply_h.bmp";
- };
-
- Bitmap BMP_CHANGE_TO_3D_H
- {
- File = "convrt3d_h.bmp";
- };
-
- Bitmap BMP_LATHE_OBJ_H
- {
- File = "rotate3d_h.bmp";
- };
-
- Bitmap BMP_PERSPECTIVE_H
- {
- File = "persp3d_h.bmp";
- };
-
- Bitmap BMP_NORMALS_OBJ_H
- {
- File = "normobjs_h.bmp";
- };
-
- Bitmap BMP_NORMALS_FLAT_H
- {
- File = "normflat_h.bmp";
- };
-
- Bitmap BMP_NORMALS_SPHERE_H
- {
- File = "normsphe_h.bmp";
- };
-
- Bitmap BMP_NORMALS_INVERT_H
- {
- File = "invert3d_h.bmp";
- };
-
- Bitmap BMP_TWO_SIDED_LIGHTING_H
- {
- File = "lght2sid_h.bmp";
- };
-
- Bitmap BMP_DOUBLE_SIDED_H
- {
- File = "doublesi_h.bmp";
- };
-
- Bitmap BMP_SHADOW_3D_H
- {
- File = "shadow3d_h.bmp";
- };
-
- Bitmap BMP_LIGHT_H
- {
- File = "light_h.bmp";
- };
-
- Bitmap BMP_LIGHT_COLOR_H
- {
- File = "colordlg_h.bmp";
- };
-
- Bitmap BMP_AMBIENT_COLOR_H
- {
- File = "colordlg_h.bmp";
- };
-
- Bitmap BMP_TEX_LUMINANCE_H
- {
- File = "luminanc_h.bmp";
- };
-
- Bitmap BMP_TEX_COLOR_H
- {
- File = "color_h.bmp";
- };
-
- Bitmap BMP_TEX_REPLACE_H
- {
- File = "replac3d_h.bmp";
- };
-
- Bitmap BMP_TEX_MODULATE_H
- {
- File = "modula3d_h.bmp";
- };
-
- Bitmap BMP_TEX_BLEND_H
- {
- File = "blend3d_h.bmp";
- };
-
- Bitmap BMP_TEX_OBJECT_H
- {
- File = "objspc3d_h.bmp";
- };
-
- Bitmap BMP_TEX_PARALLEL_H
- {
- File = "parallel_h.bmp";
- };
-
- Bitmap BMP_TEX_CIRCLE_H
- {
- File = "sphere3d_h.bmp";
- };
-
- Bitmap BMP_TEX_FILTER_H
- {
- File = "filter3d_h.bmp";
- };
-
- Bitmap BMP_COLORDLG_H
- {
- File = "colordlg_h.bmp";
- };
};
Image RID_SVXIMAGE_LIGHT_ON
@@ -1306,115 +1123,43 @@ Image RID_SVXIMAGE_LIGHT_OFF
MASKCOLOR
};
-Image RID_SVXIMAGE_LIGHT_ON_H
-{
- ImageBitmap = Bitmap { File = "lighton_h.bmp" ; };
- MASKCOLOR
-};
-
-Image RID_SVXIMAGE_LIGHT_OFF_H
-{
- ImageBitmap = Bitmap { File = "light_h.bmp" ; };
- MASKCOLOR
-};
-
Image RID_SVXIMAGE_COLORDLG
{
ImageBitmap = Bitmap { File = "colordlg.bmp" ; };
MASKCOLOR
};
-Image RID_SVXIMAGE_COLORDLG_H
-{
- ImageBitmap = Bitmap { File = "colordlg_h.bmp" ; };
- MASKCOLOR
-};
-
-/*Image RID_SVXIMAGE_LIGHT_ON_SELECTED {
- ImageBitmap = Bitmap { File = "lightons.bmp" ; };
- MASKCOLOR
-};
-Image RID_SVXIMAGE_LIGHT_OFF_SELECTED {
- ImageBitmap = Bitmap { File = "lightsel.bmp" ; };
- MASKCOLOR
-};*/
-
String RID_SVXFLOAT3D_FAVORITE
{
Text [ en-US ] = "Favorite";
};
+
String RID_SVXFLOAT3D_FIX_X
{
Text [ en-US ] = "X";
};
+
String RID_SVXFLOAT3D_FIX_Y
{
Text [ en-US ] = "Y";
};
+
String RID_SVXFLOAT3D_FIX_Z
{
Text [ en-US ] = "Z";
};
+
String RID_SVXFLOAT3D_FIX_R
{
Text [ en-US ] = "R:";
};
+
String RID_SVXFLOAT3D_FIX_G
{
Text [ en-US ] = "G:";
};
+
String RID_SVXFLOAT3D_FIX_B
{
Text [ en-US ] = "B:";
-
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 1af6a9e..61db042 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -733,7 +733,6 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
// event (ImplGenerateMouseMove) even if nothing happened. This may lead to some unwanted effects, so we
// do this check.
// For further explanation see Bug 69900.
- // FS - 18.11.99
pWnd->Enable(bAvailable);
}
@@ -1600,7 +1599,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
Reference< XRowsChangeBroadcaster> xChangeBroad(xSet,UNO_QUERY);
if ( xChangeBroad.is( ) )
xChangeBroad->addRowsChangeListener(m_xRowSetListener);
-
+
// insert the currently known rows
// and one row if we are able to insert rows
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index e0c0d88..9ad40d5 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -321,15 +321,11 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU
ResId aResId( ImplGetRID( rCmd, false ), DIALOG_MGR() ) ;
Image aImage( aResId );
- ResId aResIdHC( ImplGetRID( rCmd, true ), DIALOG_MGR() ) ;
- Image aImageHC( aResIdHC );
-
Size aImgSize( aImage.GetSizePixel() );
Size aFldSize( maField.GetSizePixel() );
long nFldY, nImgY;
maImage.SetImage( aImage );
- maImage.SetModeImage( aImageHC, BMP_COLOR_HIGHCONTRAST );
maImage.SetSizePixel( aImgSize );
// we want to see the backbround of the toolbox, not of the FixedImage or Control
maImage.SetBackground( Wallpaper( COL_TRANSPARENT ) );
@@ -347,7 +343,7 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU
Max( aImgSize.Height(), aFldSize.Height() ) ) );
SetBackground( Wallpaper() ); // transparent background
-
+
maImage.Show();
maField.SetHelpId( nSlotId );
@@ -858,7 +854,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
const bool bUndo = rView.IsUndoEnabled();
String aUndoStr;
-
+
if( bUndo )
{
aUndoStr = rView.GetDescriptionOfMarkedObjects();
@@ -871,7 +867,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, FALSE, &pItem ))
pItem = 0;
-
+
switch( nSlot )
{
case SID_ATTR_GRAF_RED:
@@ -969,7 +965,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
if( 0 < rMarkList.GetMarkCount() )
{
SdrGrafObj* pObj = (SdrGrafObj*) rMarkList.GetMark( 0 )->GetMarkedSdrObj();
-
+
if( pObj && pObj->ISA( SdrGrafObj ) &&
( pObj->GetGraphicType() != GRAPHIC_NONE ) &&
( pObj->GetGraphicType() != GRAPHIC_DEFAULT ) )
@@ -978,33 +974,33 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
const SfxMapUnit eOldMetric = rPool.GetMetric( 0 );
const MapMode aMap100( MAP_100TH_MM );
const MapMode aMapTwip( MAP_TWIP );
-
+
aGrfAttr.Put(pObj->GetMergedItemSet());
rPool.SetDefaultMetric( SFX_MAPUNIT_TWIP );
-
+
SfxItemSet aCropDlgAttr( rPool,
SDRATTR_GRAFCROP, SDRATTR_GRAFCROP,
SID_ATTR_GRAF_GRAPHIC, SID_ATTR_GRAF_GRAPHIC,
SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
SID_ATTR_GRAF_FRMSIZE, SID_ATTR_GRAF_FRMSIZE,
SID_ATTR_GRAF_CROP, SID_ATTR_GRAF_CROP, 0 );
-
+
aCropDlgAttr.Put( SvxBrushItem( pObj->GetGraphic(), GPOS_MM, SID_ATTR_GRAF_GRAPHIC ) );
aCropDlgAttr.Put( SvxSizeItem( SID_ATTR_PAGE_SIZE,
Size( OutputDevice::LogicToLogic(
Size( 200000, 200000 ), aMap100, aMapTwip ) ) ) );
aCropDlgAttr.Put( SvxSizeItem( SID_ATTR_GRAF_FRMSIZE, OutputDevice::LogicToLogic(
pObj->GetLogicRect().GetSize(), aMap100, aMapTwip ) ) );
-
+
const SdrGrafCropItem& rCrop = (const SdrGrafCropItem&) aGrfAttr.Get( SDRATTR_GRAFCROP );
Size aLTSize( OutputDevice::LogicToLogic(
Size( rCrop.GetLeft(), rCrop.GetTop() ), aMap100, aMapTwip ) );
Size aRBSize( OutputDevice::LogicToLogic(
Size( rCrop.GetRight(), rCrop.GetBottom() ), aMap100, aMapTwip ) );
-
+
aCropDlgAttr.Put( SdrGrafCropItem( aLTSize.Width(), aLTSize.Height(),
aRBSize.Width(), aRBSize.Height() ) );
-
+
SfxSingleTabDialog aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL,
aCropDlgAttr, 950 );
const String aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP );
@@ -1017,25 +1013,25 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
pTabPage->SetText( aCropStr );
aCropDialog.SetTabPage( pTabPage );
-
+
if( aCropDialog.Execute() == RET_OK )
{
const SfxItemSet* pOutAttr = aCropDialog.GetOutputItemSet();
-
+
if( pOutAttr )
{
aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCROP ) ) );
-
+
// set crop attributes
if( SFX_ITEM_SET <= pOutAttr->GetItemState( SDRATTR_GRAFCROP ) )
{
const SdrGrafCropItem& rNewCrop = (const SdrGrafCropItem&) pOutAttr->Get( SDRATTR_GRAFCROP );
-
+
aLTSize = OutputDevice::LogicToLogic( Size( rNewCrop.GetLeft(), rNewCrop.GetTop() ), aMapTwip, aMap100 );
aRBSize = OutputDevice::LogicToLogic( Size( rNewCrop.GetRight(), rNewCrop.GetBottom() ), aMapTwip, aMap100 );
aSet.Put( SdrGrafCropItem( aLTSize.Width(), aLTSize.Height(), aRBSize.Width(), aRBSize.Height() ) );
}
-
+
// set new logic rect
if( SFX_ITEM_SET <= pOutAttr->GetItemState( SID_ATTR_GRAF_FRMSIZE ) )
{
@@ -1043,18 +1039,18 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
const Size& rGrfSize = ( (const SvxSizeItem&) pOutAttr->Get( SID_ATTR_GRAF_FRMSIZE ) ).GetSize();
Size aNewGrfSize( OutputDevice::LogicToLogic( rGrfSize, aMapTwip, aMap100 ) );
Size aOldGrfSize( pObj->GetLogicRect().GetSize() );
-
+
Rectangle aNewRect( aNewOrigin, aNewGrfSize );
Point aOffset( (aNewGrfSize.Width() - aOldGrfSize.Width()) >> 1,
(aNewGrfSize.Height() - aOldGrfSize.Height()) >> 1 );
-
+
// #106181# rotate snap rect before setting it
const GeoStat& aGeo = pObj->GetGeoStat();
-
+
if (aGeo.nDrehWink!=0 || aGeo.nShearWink!=0)
{
Polygon aPol(aNewRect);
-
+
// also transform origin offset
if (aGeo.nShearWink!=0)
{
@@ -1070,7 +1066,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
aGeo.nSin,aGeo.nCos);
RotatePoint(aOffset, Point(0,0), aGeo.nSin,aGeo.nCos);
}
-
+
// apply offset
aPol.Move( -aOffset.X(), -aOffset.Y() );
aNewRect=aPol.GetBoundRect();
@@ -1079,7 +1075,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
{
aNewRect.Move( -aOffset.X(), -aOffset.Y() );
}
-
+
if( !aSet.Count() )
rView.SetMarkedObjRect( aNewRect );
else
@@ -1099,7 +1095,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
}
}
}
-
+
rPool.SetDefaultMetric( eOldMetric );
}
}
More information about the Libreoffice-commits
mailing list