summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/sdi/drgrfob.sdi26
-rw-r--r--sd/sdi/sdnew.sdi189
-rw-r--r--sd/source/ui/app/app.src28
-rw-r--r--sd/source/ui/app/sddll2.cxx8
-rw-r--r--sd/source/ui/app/tbx_ww.src107
-rw-r--r--sd/source/ui/app/tbxww.cxx19
-rw-r--r--sd/source/ui/app/toolbox.src8
-rw-r--r--sd/source/ui/dlg/makefile.mk13
-rw-r--r--sd/source/ui/func/makefile.mk6
9 files changed, 49 insertions, 355 deletions
diff --git a/sd/sdi/drgrfob.sdi b/sd/sdi/drgrfob.sdi
index 7d4b596f0abf..39a80d251051 100644
--- a/sd/sdi/drgrfob.sdi
+++ b/sd/sdi/drgrfob.sdi
@@ -1,61 +1,61 @@
shell SdDrawGrafObjectBar
{
- SID_GRAFTBX_FILTERS // ole : no, status : ?
+ SID_GRFFILTER
[
ExecMethod = ExecuteFilter;
- StateMethod = GetFilterState ;
+ StateMethod = GetFilterState;
]
- SID_GRAFFILTER_INVERT // ole : no, status : no
+ SID_GRFFILTER_INVERT // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState ;
]
- SID_GRAFFILTER_SMOOTH // ole : no, status : no
+ SID_GRFFILTER_SMOOTH // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState ;
]
- SID_GRAFFILTER_SHARPEN // ole : no, status : no
+ SID_GRFFILTER_SHARPEN // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState ;
]
- SID_GRAFFILTER_REMOVENOISE // ole : no, status : no
+ SID_GRFFILTER_REMOVENOISE // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState ;
]
- SID_GRAFFILTER_SOBEL // ole : no, status : no
+ SID_GRFFILTER_SOBEL // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState;
]
- SID_GRAFFILTER_MOSAIC // ole : no, status : no
+ SID_GRFFILTER_MOSAIC // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState;
]
- SID_GRAFFILTER_EMBOSS // ole : no, status : no
+ SID_GRFFILTER_EMBOSS // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState;
]
- SID_GRAFFILTER_POSTER // ole : no, status : no
+ SID_GRFFILTER_POSTER // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState;
]
- SID_GRAFFILTER_POPART // ole : no, status : no
+ SID_GRFFILTER_POPART // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState;
]
- SID_GRAFFILTER_SEPIA // ole : no, status : no
+ SID_GRFFILTER_SEPIA // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState;
]
- SID_GRAFFILTER_SOLARIZE // ole : no, status : no
+ SID_GRFFILTER_SOLARIZE // ole : no, status : no
[
ExecMethod = ExecuteFilter;
StateMethod = GetFilterState;
diff --git a/sd/sdi/sdnew.sdi b/sd/sdi/sdnew.sdi
index f5ed480a96e0..a1c04caebae2 100644
--- a/sd/sdi/sdnew.sdi
+++ b/sd/sdi/sdnew.sdi
@@ -1,192 +1,3 @@
-SfxVoidItem GrafFilterCharcoal SID_GRAFFILTER_SOBEL
-()
-[
- AutoUpdate = FALSE ,
- Cachable = Cachable ,
- FastCall = FALSE ,
- HasCoreId = FALSE ,
- HasDialog = FALSE ,
- ReadOnlyDoc = FALSE ,
- Toggle = FALSE ,
- Synchron ;
-
- Container = FALSE ,
- PlugComm = FALSE ,
-
- Export = TRUE ,
- IsCollection = FALSE ,
- RecordAbsolute = FALSE ,
- RecordPerSet ;
-
- AccelConfig = TRUE ,
- MenuConfig = TRUE ,
- StatusBarConfig = FALSE ,
- ToolBoxConfig = TRUE ,
- GroupId = GID_MODIFY ;
-]
-
-SfxVoidItem GrafFilterMosaic SID_GRAFFILTER_MOSAIC
-()
-[
- AutoUpdate = FALSE ,
- Cachable = Cachable ,
- FastCall = FALSE ,
- HasCoreId = FALSE ,
- HasDialog = FALSE ,
- ReadOnlyDoc = FALSE ,
- Toggle = FALSE ,
- Synchron ;
-
- Container = FALSE ,
- PlugComm = FALSE ,
-
- Export = TRUE ,
- IsCollection = FALSE ,
- RecordAbsolute = FALSE ,
- RecordPerSet ;
-
- AccelConfig = TRUE ,
- MenuConfig = TRUE ,
- StatusBarConfig = FALSE ,
- ToolBoxConfig = TRUE ,
- GroupId = GID_MODIFY ;
-]
-
-SfxVoidItem GrafFilterRelief SID_GRAFFILTER_EMBOSS
-()
-[
- AutoUpdate = FALSE ,
- Cachable = Cachable ,
- FastCall = FALSE ,
- HasCoreId = FALSE ,
- HasDialog = FALSE ,
- ReadOnlyDoc = FALSE ,
- Toggle = FALSE ,
- Synchron ;
-
- Container = FALSE ,
- PlugComm = FALSE ,
-
- Export = TRUE ,
- IsCollection = FALSE ,
- RecordAbsolute = FALSE ,
- RecordPerSet ;
-
- AccelConfig = TRUE ,
- MenuConfig = TRUE ,
- StatusBarConfig = FALSE ,
- ToolBoxConfig = TRUE ,
- GroupId = GID_MODIFY ;
-]
-
-SfxVoidItem GrafFilterPoster SID_GRAFFILTER_POSTER
-()
-[
- AutoUpdate = FALSE ,
- Cachable = Cachable ,
- FastCall = FALSE ,
- HasCoreId = FALSE ,
- HasDialog = FALSE ,
- ReadOnlyDoc = FALSE ,
- Toggle = FALSE ,
- Synchron ;
-
- Container = FALSE ,
- PlugComm = FALSE ,
-
- Export = TRUE ,
- IsCollection = FALSE ,
- RecordAbsolute = FALSE ,
- RecordPerSet ;
-
- AccelConfig = TRUE ,
- MenuConfig = TRUE ,
- StatusBarConfig = FALSE ,
- ToolBoxConfig = TRUE ,
- GroupId = GID_MODIFY ;
-]
-
-SfxVoidItem GrafFilterPopart SID_GRAFFILTER_POPART
-()
-[
- AutoUpdate = FALSE ,
- Cachable = Cachable ,
- FastCall = FALSE ,
- HasCoreId = FALSE ,
- HasDialog = FALSE ,
- ReadOnlyDoc = FALSE ,
- Toggle = FALSE ,
- Synchron ;
-
- Container = FALSE ,
- PlugComm = FALSE ,
-
- Export = TRUE ,
- IsCollection = FALSE ,
- RecordAbsolute = FALSE ,
- RecordPerSet ;
-
- AccelConfig = TRUE ,
- MenuConfig = TRUE ,
- StatusBarConfig = FALSE ,
- ToolBoxConfig = TRUE ,
- GroupId = GID_MODIFY ;
-]
-
-SfxVoidItem GrafFilterSepia SID_GRAFFILTER_SEPIA
-()
-[
- AutoUpdate = FALSE ,
- Cachable = Cachable ,
- FastCall = FALSE ,
- HasCoreId = FALSE ,
- HasDialog = FALSE ,
- ReadOnlyDoc = FALSE ,
- Toggle = FALSE ,
- Synchron ;
-
- Container = FALSE ,
- PlugComm = FALSE ,
-
- Export = TRUE ,
- IsCollection = FALSE ,
- RecordAbsolute = FALSE ,
- RecordPerSet ;
-
- AccelConfig = TRUE ,
- MenuConfig = TRUE ,
- StatusBarConfig = FALSE ,
- ToolBoxConfig = TRUE ,
- GroupId = GID_MODIFY ;
-]
-
-SfxVoidItem GrafFilterSolarize SID_GRAFFILTER_SOLARIZE
-()
-[
- AutoUpdate = FALSE ,
- Cachable = Cachable ,
- FastCall = FALSE ,
- HasCoreId = FALSE ,
- HasDialog = FALSE ,
- ReadOnlyDoc = FALSE ,
- Toggle = FALSE ,
- Synchron ;
-
- Container = FALSE ,
- PlugComm = FALSE ,
-
- Export = TRUE ,
- IsCollection = FALSE ,
- RecordAbsolute = FALSE ,
- RecordPerSet ;
-
- AccelConfig = TRUE ,
- MenuConfig = TRUE ,
- StatusBarConfig = FALSE ,
- ToolBoxConfig = TRUE ,
- GroupId = GID_MODIFY ;
-]
-
//--------------------------------------------------------------------------
SfxVoidItem GrafAttrCrop SID_ATTR_GRAF_CROP
()
diff --git a/sd/source/ui/app/app.src b/sd/source/ui/app/app.src
index b12b94f9e059..cd9274de0428 100644
--- a/sd/source/ui/app/app.src
+++ b/sd/source/ui/app/app.src
@@ -2,9 +2,9 @@
*
* $RCSfile: app.src,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: tbe $ $Date: 2000-11-10 16:14:15 $
+ * last change: $Author: ka $ $Date: 2000-11-18 11:43:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -391,20 +391,20 @@
SID_ATTR_GRAF_INVERT;\
SID_INSERT_SOUND;\
SID_INSERT_VIDEO;\
- SID_GRAFTBX_FILTERS;\
- SID_GRAFFILTER_INVERT;\
- SID_GRAFFILTER_SMOOTH;\
- SID_GRAFFILTER_SHARPEN;\
- SID_GRAFFILTER_REMOVENOISE;\
SID_OBJECT_TRANSPARENCE;\
SID_OBJECT_GRADIENT;\
- SID_GRAFFILTER_SOBEL;\
- SID_GRAFFILTER_MOSAIC;\
- SID_GRAFFILTER_EMBOSS;\
- SID_GRAFFILTER_POSTER;\
- SID_GRAFFILTER_POPART;\
- SID_GRAFFILTER_SEPIA;\
- SID_GRAFFILTER_SOLARIZE;\
+ SID_GRFFILTER;\
+ SID_GRFFILTER_INVERT;\
+ SID_GRFFILTER_SMOOTH;\
+ SID_GRFFILTER_SHARPEN;\
+ SID_GRFFILTER_REMOVENOISE;\
+ SID_GRFFILTER_SOBEL;\
+ SID_GRFFILTER_MOSAIC;\
+ SID_GRFFILTER_EMBOSS;\
+ SID_GRFFILTER_POSTER;\
+ SID_GRFFILTER_POPART;\
+ SID_GRFFILTER_SEPIA;\
+ SID_GRFFILTER_SOLARIZE;\
SID_ATTR_GRAF_CROP;\
};\
IdCount = {\
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index 7fdb509fe998..380b9af1c9d8 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sddll2.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 16:48:30 $
+ * last change: $Author: ka $ $Date: 2000-11-18 11:37:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -217,7 +217,8 @@ void SdDLL::RegisterControllers()
SvxFontHeightToolBoxControl::RegisterControl(0, pMod);
SvxFontColorToolBoxControl::RegisterControl(0, pMod);
- SdTbxControl::RegisterControl( SID_GRAFTBX_FILTERS, pMod );
+ SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod );
+ SvxGrafModeToolBoxControl::RegisterControl( SID_ATTR_GRAF_MODE, pMod );
SvxGrafRedToolBoxControl::RegisterControl( SID_ATTR_GRAF_RED, pMod );
SvxGrafGreenToolBoxControl::RegisterControl( SID_ATTR_GRAF_GREEN, pMod );
SvxGrafBlueToolBoxControl::RegisterControl( SID_ATTR_GRAF_BLUE, pMod );
@@ -225,7 +226,6 @@ void SdDLL::RegisterControllers()
SvxGrafContrastToolBoxControl::RegisterControl( SID_ATTR_GRAF_CONTRAST, pMod );
SvxGrafGammaToolBoxControl::RegisterControl( SID_ATTR_GRAF_GAMMA, pMod );
SvxGrafTransparenceToolBoxControl::RegisterControl( SID_ATTR_GRAF_TRANSPARENCE, pMod );
- SvxGrafModeToolBoxControl::RegisterControl( SID_ATTR_GRAF_MODE, pMod );
// StatusBarControls registrieren
SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod );
diff --git a/sd/source/ui/app/tbx_ww.src b/sd/source/ui/app/tbx_ww.src
index a4e407e48752..b088c0706e0a 100644
--- a/sd/source/ui/app/tbx_ww.src
+++ b/sd/source/ui/app/tbx_ww.src
@@ -2,9 +2,9 @@
*
* $RCSfile: tbx_ww.src,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kz $ $Date: 2000-10-27 16:20:59 $
+ * last change: $Author: ka $ $Date: 2000-11-18 11:40:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1334,106 +1334,5 @@ FloatingWindow RID_POSITION
Text[ turkish ] = "Sralama";
Text[ language_user1 ] = " ";
};
-FloatingWindow RID_GRAFFILTERS
-{
- HelpId = HID_SD_FW_GRAFFILTERS ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Text = "Filter" ;
- Text [ ENGLISH ] = "Filter" ;
- Text [ english_us ] = "Filter" ;
- ToolBox RID_GRAFFILTERS_TBX
- {
- SVLook = TRUE ;
- MenuStrings = TRUE ;
- Align = BOXALIGN_TOP;
- LineCount = 3;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_INVERT ;
- HelpID = SID_GRAFFILTER_INVERT ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_SMOOTH ;
- HelpID = SID_GRAFFILTER_SMOOTH ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_SHARPEN ;
- HelpID = SID_GRAFFILTER_SHARPEN ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_REMOVENOISE ;
- HelpID = SID_GRAFFILTER_REMOVENOISE ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_BREAK ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_SOLARIZE ;
- HelpId = SID_GRAFFILTER_SOLARIZE ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_SEPIA ;
- HelpId = SID_GRAFFILTER_SEPIA ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_POSTER ;
- HelpId = SID_GRAFFILTER_POSTER ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_POPART ;
- HelpId = SID_GRAFFILTER_POPART ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_BREAK ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_SOBEL ;
- HelpId = SID_GRAFFILTER_SOBEL ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_EMBOSS ;
- HelpId = SID_GRAFFILTER_EMBOSS ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRAFFILTER_MOSAIC ;
- HelpId = SID_GRAFFILTER_MOSAIC ;
- };
- };
- };
- Text[ portuguese ] = "Filtros";
- Text[ russian ] = "";
- Text[ greek ] = "";
- Text[ dutch ] = "Filter";
- Text[ french ] = "Filtre";
- Text[ spanish ] = "Filtros";
- Text[ italian ] = "Filtri";
- Text[ danish ] = "Filter";
- Text[ swedish ] = "Filter";
- Text[ polish ] = "Filtr";
- Text[ portuguese_brazilian ] = "Filter";
- Text[ japanese ] = "̨";
- Text[ korean ] = "";
- Text[ chinese_simplified ] = "ɸѡ";
- Text[ chinese_traditional ] = "Lo";
- Text[ arabic ] = "";
- Text[ turkish ] = "Filtre";
- Text[ language_user1 ] = " ";
-};
+
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 8a4462cad0fb..abc259e7bc9b 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tbxww.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 16:48:31 $
+ * last change: $Author: ka $ $Date: 2000-11-18 11:40:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,8 +97,7 @@ SdPopupWindowTbx::SdPopupWindowTbx( USHORT nId, WindowAlign eAlign,
FreeResource();
- if( ( SID_GRAFTBX_FILTERS != nId ) &&
- ( ( eAlign == WINDOWALIGN_TOP ) || ( eAlign == WINDOWALIGN_BOTTOM ) ) )
+ if( ( eAlign == WINDOWALIGN_TOP ) || ( eAlign == WINDOWALIGN_BOTTOM ) )
{
aTbx.GetToolBox().SetAlign( WINDOWALIGN_LEFT );
SetText( String() );
@@ -285,15 +284,6 @@ SfxPopupWindow* __EXPORT SdTbxControl::CreatePopupWindow()
SdResId( RID_INSERT_TBX ), GetBindings() );
}
break;
-
- case SID_GRAFTBX_FILTERS:
- {
- pWin = new SdPopupWindowTbx( GetId(), this->GetToolBox().GetAlign(),
- SdResId( RID_GRAFFILTERS ),
- SdResId( RID_GRAFFILTERS_TBX ), GetBindings() );
- }
- break;
-
}
if( pWin )
{
@@ -341,8 +331,7 @@ void __EXPORT SdTbxControl::StateChanged( USHORT nSId,
if( nSId != SID_ZOOM_TOOLBOX &&
nSId != SID_DRAWTBX_INSERT &&
- nSId != SID_POSITION &&
- nSId != SID_GRAFTBX_FILTERS )
+ nSId != SID_POSITION )
{
if( nSId != SID_OBJECT_CHOOSE_MODE &&
rTbx.IsItemChecked( SID_OBJECT_CHOOSE_MODE ) )
diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src
index 9cd5a9fb1a85..a7a30a7d0a3d 100644
--- a/sd/source/ui/app/toolbox.src
+++ b/sd/source/ui/app/toolbox.src
@@ -2,9 +2,9 @@
*
* $RCSfile: toolbox.src,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: ka $ $Date: 2000-09-29 08:54:00 $
+ * last change: $Author: ka $ $Date: 2000-11-18 11:40:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -674,8 +674,8 @@ ToolBox RID_DRAW_GRAF_TOOLBOX
{
ToolBoxItem
{
- Identifier = SID_GRAFTBX_FILTERS ;
- HelpID = SID_GRAFTBX_FILTERS ;
+ Identifier = SID_GRFFILTER;
+ HelpID = SID_GRFFILTER;
DropDown = TRUE ;
Checkable = FALSE ;
RadioCheck = FALSE ;
diff --git a/sd/source/ui/dlg/makefile.mk b/sd/source/ui/dlg/makefile.mk
index 467cfec2d3e5..56ee255cbe97 100644
--- a/sd/source/ui/dlg/makefile.mk
+++ b/sd/source/ui/dlg/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1.1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: hr $ $Date: 2000-09-18 16:48:33 $
+# last change: $Author: ka $ $Date: 2000-11-18 11:44:07 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -126,8 +126,7 @@ CXXFILES = $(PRJ)$/util$/sd.cxx \
htmlattr.cxx \
vectdlg.cxx \
docprev.cxx \
- packgdlg.cxx \
- dlgflt.cxx
+ packgdlg.cxx
SRCFILES =\
ins_page.src\
@@ -162,8 +161,7 @@ SRCFILES =\
brkdlg.src\
vectdlg.src\
dlgolbul.src\
- packgdlg.src\
- dlgflt.src
+ packgdlg.src
SLOFILES = \
@@ -215,8 +213,7 @@ SLOFILES = \
$(SLO)$/htmlattr.obj \
$(SLO)$/vectdlg.obj \
$(SLO)$/docprev.obj \
- $(SLO)$/packgdlg.obj \
- $(SLO)$/dlgflt.obj
+ $(SLO)$/packgdlg.obj
.IF "$(GUI)" == "WIN"
diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk
index a63b4b7a3910..95ed9cabd961 100644
--- a/sd/source/ui/func/makefile.mk
+++ b/sd/source/ui/func/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: cl $ $Date: 2000-10-26 12:45:44 $
+# last change: $Author: ka $ $Date: 2000-11-18 11:45:06 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -155,7 +155,6 @@ CXXFILES = $(PRJ)$/util$/sd.cxx \
speedctl.cxx \
fuvect.cxx \
bulmaper.cxx \
- fugrfflt.cxx \
fupngdlg.cxx
EXCEPTIONSFILES= \
@@ -238,7 +237,6 @@ SLOFILES = \
$(SLO)$/speedctl.obj \
$(SLO)$/fuvect.obj \
$(SLO)$/bulmaper.obj \
- $(SLO)$/fugrfflt.obj \
$(SLO)$/fupngdlg.obj
generated by cgit (git 2.34.1) at 2025-02-01 21:55:46 +0000