[Libreoffice-commits] core.git: 2 commits - basctl/AllLangResTarget_basctl.mk basctl/source cui/AllLangResTarget_cui.mk cui/source dbaccess/source include/sfx2 include/svx sd/inc sd/source sfx2/AllLangResTarget_sfx2.mk sfx2/source svx/source vcl/source
Caolán McNamara
caolanm at redhat.com
Sat Aug 17 05:09:52 PDT 2013
basctl/AllLangResTarget_basctl.mk | 1
basctl/source/basicide/moptions.hrc | 40 ----------
basctl/source/basicide/moptions.src | 115 ------------------------------
cui/AllLangResTarget_cui.mk | 1
cui/source/dialogs/grfflt.src | 7 -
cui/source/dialogs/svuidlg.hrc | 17 ----
cui/source/dialogs/svuidlg.src | 120 --------------------------------
cui/source/inc/cuires.hrc | 3
cui/source/inc/helpid.hrc | 1
cui/source/options/optinet2.hrc | 8 --
cui/source/options/optinet2.src | 42 -----------
cui/source/options/optsave.hrc | 6 -
cui/source/options/optsave.src | 65 -----------------
dbaccess/source/ui/dlg/dbadmin.hrc | 4 -
dbaccess/source/ui/dlg/dbadmin2.src | 43 -----------
dbaccess/source/ui/inc/dbu_resource.hrc | 1
include/sfx2/sfx.hrc | 2
include/svx/fmresids.hrc | 1
sd/inc/helpids.h | 1
sd/source/ui/app/strings.src | 42 -----------
sd/source/ui/inc/strings.hrc | 7 -
sfx2/AllLangResTarget_sfx2.mk | 1
sfx2/source/dialog/dinfedt.cxx | 1
sfx2/source/dialog/dinfedt.hrc | 32 --------
sfx2/source/dialog/dinfedt.src | 87 -----------------------
sfx2/source/inc/helpid.hrc | 1
svx/source/form/fmexpl.src | 39 ----------
vcl/source/edit/texteng.cxx | 5 +
28 files changed, 5 insertions(+), 688 deletions(-)
New commits:
commit d13251f284797ab9de8164e111931cdee74e3699
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 17 13:08:32 2013 +0100
fix DBG_ASSERT post String->OUString conversion
Change-Id: I9ade42e97218449f7fef7d2582fbbe8d1063c2f6
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 0de2ffd..cd84e6f 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1224,8 +1224,11 @@ sal_uLong TextEngine::CalcTextHeight()
sal_uLong TextEngine::CalcTextWidth( sal_uLong nPara, sal_uInt16 nPortionStart, sal_uInt16 nLen, const Font* pFont )
{
+#ifdef DBG_UTIL
// within the text there must not be a Portion change (attribute/tab)!
- DBG_ASSERT( mpDoc->GetNodes().GetObject( nPara )->GetText().indexOf( '\t', nPortionStart ) >= (nPortionStart+nLen), "CalcTextWidth: Tab!" );
+ sal_Int32 nTabPos = mpDoc->GetNodes().GetObject( nPara )->GetText().indexOf( '\t', nPortionStart );
+ DBG_ASSERT( nTabPos == -1 || nTabPos >= (nPortionStart+nLen), "CalcTextWidth: Tab!" );
+#endif
sal_uLong nWidth;
if ( mnFixCharWidth100 )
commit 91da17722924dc505553120750712d491b238343
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 17 12:24:02 2013 +0100
remove various unused dialogs
Change-Id: If639745db976671a3b6e3405253dfb3bc5783363
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index ba1a4e1..23cc08e 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\
basctl/source/basicide/brkdlg.src \
basctl/source/basicide/macrodlg.src \
basctl/source/basicide/moduldlg.src \
- basctl/source/basicide/moptions.src \
basctl/source/basicide/objdlg.src \
basctl/source/dlged/dlgresid.src \
basctl/source/dlged/managelang.src \
diff --git a/basctl/source/basicide/moptions.hrc b/basctl/source/basicide/moptions.hrc
deleted file mode 100644
index ee0222e..0000000
--- a/basctl/source/basicide/moptions.hrc
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- 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 BASCTL_MOPTIONS_HRC
-#define BASCTL_MOPTIONS_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_MACROOPTIONS ( RID_BASICIDE_START + 55 )
-
-#define RID_FT_SBXNAME 2
-#define RID_PB_OK 3
-#define RID_PB_CANCEL 4
-#define RID_PB_HELP 5
-#define RID_FT_DESCR 6
-#define RID_ME_DESCR 7
-#define RID_FL_HELP 8
-#define RID_FT_HELPID 9
-#define RID_NF_HELPID 10
-#define RID_FT_HELPNAME 11
-#define RID_ED_HELPNAME 12
-
-#endif // BASCTL_MOPTIONS_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src
deleted file mode 100644
index de091f6..0000000
--- a/basctl/source/basicide/moptions.src
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- 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 "helpid.hrc"
-#include <moptions.hrc>
-ModalDialog RID_MACROOPTIONS
-{
- HelpId = "basctl:ModalDialog:RID_MACROOPTIONS" ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 224 , 121 ) ;
- Text [ en-US ] = "Description" ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- FixedText RID_FT_SBXNAME
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
- };
- OKButton RID_PB_OK
- {
- Pos = MAP_APPFONT ( 168 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton RID_PB_CANCEL
- {
- Pos = MAP_APPFONT ( 168 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton RID_PB_HELP
- {
- Pos = MAP_APPFONT ( 168 , 53 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText RID_FT_DESCR
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 19 ) ;
- Size = MAP_APPFONT ( 69 , 10 ) ;
- Text [ en-US ] = "Description" ;
- };
- MultiLineEdit RID_ME_DESCR
- {
- HelpID = "basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR";
- Border = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 32 ) ;
- Size = MAP_APPFONT ( 154 , 36 ) ;
- TabStop = TRUE ;
- VScroll = TRUE ;
- IgnoreTab = TRUE ;
- };
- FixedLine RID_FL_HELP
- {
- Pos = MAP_APPFONT ( 6 , 73 ) ;
- Size = MAP_APPFONT ( 212 , 8 ) ;
- Text [ en-US ] = "Help information" ;
- };
- FixedText RID_FT_HELPID
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 9 , 83 ) ;
- Size = MAP_APPFONT ( 80 , 10 ) ;
- Text [ en-US ] = "Help ID" ;
- };
- NumericField RID_NF_HELPID
- {
- HelpID = "basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID";
- Border = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 95 , 83 ) ;
- Size = MAP_APPFONT ( 120 , 12 ) ;
- TabStop = TRUE ;
- Minimum = 0 ;
- Maximum = 0xFFFFFFFF ;
- };
- FixedText RID_FT_HELPNAME
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 9 , 99 ) ;
- Size = MAP_APPFONT ( 80 , 10 ) ;
- Text [ en-US ] = "Help file name" ;
- };
- Edit RID_ED_HELPNAME
- {
- HelpID = "basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 95 , 99 ) ;
- Size = MAP_APPFONT ( 120 , 12 ) ;
- TabStop = TRUE ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 738aea8..a6855ea 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optjava.src \
cui/source/options/optlingu.src \
cui/source/options/optpath.src \
- cui/source/options/optsave.src \
cui/source/options/treeopt.src \
cui/source/tabpages/align.src \
cui/source/tabpages/autocdlg.src \
diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src
index 324f01b..73b1094 100644
--- a/cui/source/dialogs/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -356,13 +356,6 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
// - DLG_FILTEREMBOSS -
// --------------------
-TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB
-{
- HelpID = "cui:TabPage:RID_SVX_GRFFILTER_DLG_EMBOSS_TAB";
- Pos = MAP_APPFONT ( 0, 0 ) ;
- Size = MAP_APPFONT ( 0, 0 ) ;
-};
-
ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
{
HelpID = CMD_SID_GRFFILTER_EMBOSS;
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index 704017c..a134633 100644
--- a/cui/source/dialogs/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -53,21 +53,4 @@
#define FT_FILES2 47
#define FT_FULL_FILE_NAME 48
-#define MD_LINKEDIT 32004
-#define ED_FULL_SOURCE_NAME 1
-
-#define ED_FILEPATH 10
-#define BTN_FILEPATH 11
-#define CB_FILELINK 12
-
-#define MD_INSERT_OBJECT_APPLET 32009
-#define FT_CLASSFILE 10
-#define ED_CLASSFILE 11
-#define FT_CLASSLOCATION 12
-#define ED_CLASSLOCATION 12
-#define BTN_CLASS 13
-#define GB_CLASS 14
-#define ED_APPLET_OPTIONS 20
-#define GB_APPLET_OPTIONS 21
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index d8c0194..0522ff3 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -177,126 +177,6 @@ ModalDialog MD_UPDATE_BASELINKS
Text [ en-US ] = "Waiting";
};
};
-ModalDialog MD_LINKEDIT
-{
- HelpID = "cui:ModalDialog:MD_LINKEDIT";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 222 , 58 ) ;
- Text [ en-US ] = "Modify Link" ;
- Moveable = TRUE ;
- OKButton 1
- {
- Pos = MAP_APPFONT ( 165 , 5 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE ;
- };
- CancelButton 1
- {
- Pos = MAP_APPFONT ( 165 , 25 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- FixedText FT_FULL_TYPE_NAME
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 5 , 5 ) ;
- Size = MAP_APPFONT ( 155 , 10 ) ;
- };
- FixedText 2
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 5 , 20 ) ;
- Size = MAP_APPFONT ( 75 , 10 ) ;
- Text [ en-US ] = "Exchange source:" ;
- };
- Edit ED_FULL_SOURCE_NAME
- {
- HelpID = "cui:Edit:MD_LINKEDIT:ED_FULL_SOURCE_NAME";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 5 , 35 ) ;
- Size = MAP_APPFONT ( 155 , 12 ) ;
- Text [ en-US ] = "Edit" ;
- };
-};
-ModalDialog MD_INSERT_OBJECT_APPLET
-{
- HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_APPLET";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 284 , 164 ) ;
- Moveable = TRUE ;
- FixedText FT_CLASSFILE
- {
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 204 , 10 ) ;
- Text [ en-US ] = "~Class" ;
- };
- Edit ED_CLASSFILE
- {
- HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 27 ) ;
- Size = MAP_APPFONT ( 204 , 12 ) ;
- };
- FixedText FT_CLASSLOCATION
- {
- Pos = MAP_APPFONT ( 12 , 42 ) ;
- Size = MAP_APPFONT ( 204 , 10 ) ;
- Text [ en-US ] = "Class ~Location" ;
- };
- Edit ED_CLASSLOCATION
- {
- HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 55 ) ;
- Size = MAP_APPFONT ( 204 , 12 ) ;
- };
- PushButton BTN_CLASS
- {
- HelpID = "cui:PushButton:MD_INSERT_OBJECT_APPLET:BTN_CLASS";
- Pos = MAP_APPFONT ( 166 , 70 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Search..." ;
- };
- FixedLine GB_CLASS
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 216 , 8 ) ;
- Text [ en-US ] = "File" ;
- };
- MultiLineEdit ED_APPLET_OPTIONS
- {
- HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 107 ) ;
- Size = MAP_APPFONT ( 204 , 45 ) ;
- VScroll = TRUE ;
- IgnoreTab = TRUE;
- };
- FixedLine GB_APPLET_OPTIONS
- {
- Pos = MAP_APPFONT ( 6 , 96 ) ;
- Size = MAP_APPFONT ( 216 , 8 ) ;
- Text [ en-US ] = "Options" ;
- };
- OKButton 1
- {
- Pos = MAP_APPFONT ( 228 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE ;
- };
- CancelButton 1
- {
- Pos = MAP_APPFONT ( 228 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- HelpButton 1
- {
- Pos = MAP_APPFONT ( 228 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- Text [ en-US ] = "Insert Applet" ;
-};
Control TB_LINKS
{
Border = TRUE ;
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 4263c8d..d3f0779 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -159,7 +159,6 @@
#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855)
#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320)
#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224)
-#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225)
#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254)
#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255)
#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
@@ -167,7 +166,6 @@
#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830)
#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831)
#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
-#define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248)
#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026)
#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //?
@@ -197,7 +195,6 @@
// dialogs
#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 )
-#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337)
#define STR_MODIFY (RID_SVX_START + 336)//from optdict.src
#define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22)
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index ef2dddb..63b3502 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -36,7 +36,6 @@
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
#define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER"
#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH"
-#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING"
#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST"
#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 25d1eae..cc5a06e 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -22,14 +22,6 @@
#include <sfx2/tabpage.hrc>
#include <svtools/controldims.hrc>
-// Defines - JavaScriptDisableQueryBox_Impl -------------------------------
-
-#define IMG_JSCPT_WARNING 220
-#define FT_JSCPT_WARNING 221
-#define CB_JSCPT_DISABLE 222
-#define BTN_JSCPT_YES 224
-#define BTN_JSCPT_NO 225
-
// Defines - SvxEMailTabPage_Impl
#define FL_MAIL 1
#define FT_MAILERURL 2
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index e572abe..2c282ac 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -28,46 +28,4 @@ ErrorBox RID_SVXERR_OPT_PROXYPORTS
Message [ en-US ] = "Invalid value!\n\nThe maximum value for a port number is 65535.";
};
-// RID_SVXDLG_OPT_JAVASCRIPT_DISABLE -----------------------------------------
-
-ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
-{
- HelpID = "cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE";
- OutputSize = TRUE;
- Size = MAP_APPFONT( 150, 81 );
- Moveable = TRUE;
- Closeable = TRUE;
- FixedImage IMG_JSCPT_WARNING
- {
- Pos = MAP_APPFONT( 6, 6 );
- Size = MAP_APPFONT( 30, 30 );
- };
- FixedText FT_JSCPT_WARNING
- {
- Pos = MAP_APPFONT( 39, 6 );
- Size = MAP_APPFONT( 195, 36 );
- WordBreak = TRUE;
- Text [ en-US ] = "Please note that with Java\nyou disable Javascript as well.\n\nDo you still want to disable Java?";
- };
- CheckBox CB_JSCPT_DISABLE
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE";
- Pos = MAP_APPFONT( 39, 45 );
- Size = MAP_APPFONT( 195, 12 );
- Hide = TRUE;
- Text [ en-US ] = "~Don't show warning again";
- };
- OKButton BTN_JSCPT_YES
- {
- Pos = MAP_APPFONT( 41, 61 );
- Size = MAP_APPFONT( 50, 14 );
- };
- CancelButton BTN_JSCPT_NO
- {
- Pos = MAP_APPFONT( 94, 61 );
- Size = MAP_APPFONT( 50, 14 );
- DefButton = TRUE;
- };
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
index bc20142..83340af 100644
--- a/cui/source/options/optsave.hrc
+++ b/cui/source/options/optsave.hrc
@@ -30,12 +30,6 @@
#define APP_MATH 6
#define APP_COUNT 7
-//Filter warning
-#define PB_OK 1
-#define FT_FILTER_WARNING 2
-#define IMG_WARNING 4
-#define PB_CANCEL 5
-
#endif // #ifndef _SVX_OPTSAVE_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
deleted file mode 100644
index 287709a..0000000
--- a/cui/source/options/optsave.src
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- 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 <sfx2/sfx.hrc>
-#include <cuires.hrc>
-#include "helpid.hrc"
-#include "optsave.hrc"
-
- // SID_SFXPAGE_SAVE ------------------------------------------------------
-#define TEXT_SAVEPAGE \
- Text [ en-US ] = "Save" ;\
-
-ModalDialog RID_SVXDLG_FILTER_WARNING
-{
- HelpID = HID_SVXDLG_FILTER_WARNING;
- OutputSize = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Sizeable = FALSE ;
- Border = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT( 175 + 39 + (3 * 6), (4 * 9)+ 12 + (3 * 12) + 6 - 21 );
- Text = "%PRODUCTNAME %PRODUCTVERSION" ;
- FixedImage IMG_WARNING
- {
- Pos = MAP_APPFONT( 6, 6 );
- Size = MAP_APPFONT( 30, 30 );
- };
- FixedText FT_FILTER_WARNING
- {
- Pos = MAP_APPFONT( 39, 6 );
- Size = MAP_APPFONT( 175, 4 * 9 );
- Wordbreak = TRUE;
- Text [ en-US ] = "Using \"%1\" as default file format may cause information loss.\n";
- };
- OKButton PB_OK
- {
- Pos = MAP_APPFONT( 60, (4 * 9)/*+ 12*/ + 13 );
- Size = MAP_APPFONT( 50, 14 );
- DefButton = TRUE;
- };
- CancelButton PB_CANCEL
- {
- Pos = MAP_APPFONT( 120, (4 * 9)/*+ 12*/ + 13 );
- Size = MAP_APPFONT( 50, 14 );
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
index 88bf919..99fe79c 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -38,16 +38,12 @@
#define FT_LDAPROWCOUNT 13
#define ET_USERNAME 1
-#define ET_PASSWORD 2
#define ET_OPTIONS 3
#define ET_JDBCDRIVERCLASS 4
#define ET_HOSTNAME 5
#define ET_BASEDN 6
#define PB_INDICIES 1
-#define BTN_PASSWORD_OK 2
-#define BTN_PASSWORD_CANCEL 3
-#define BTN_PASSWORD_HELP 4
#define PB_TESTDRIVERCLASS 5
#define CB_PASSWORD_REQUIRED 1
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index c7e6327..bdbff0a 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -51,49 +51,6 @@ String STR_COULD_NOT_CREATE_DIRECTORY
#define WIN_X 220
#define WIN_Y 72
-ModalDialog DLG_DOMAINPASSWORD
-{
- HelpID = "dbaccess:ModalDialog:DLG_DOMAINPASSWORD";
- Border = TRUE ;
- Moveable = TRUE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
- Text[ en-US ] = "Convert Database";
-
- FixedLine FT_PASSWORD
- {
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( WIN_X - 3 - 6 - 6 - 50 , 8 ) ;
- Text[ en-US ] = "Please enter the ~password for the user 'DOMAIN'.";
- };
-
- Edit ET_PASSWORD
- {
- HelpID = "dbaccess:Edit:DLG_DOMAINPASSWORD:ET_PASSWORD";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ;
- Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
- PassWord = TRUE ;
- };
- OKButton BTN_PASSWORD_OK
- {
- Pos = MAP_APPFONT ( WIN_X - 56 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE ;
- };
- CancelButton BTN_PASSWORD_CANCEL
- {
- Pos = MAP_APPFONT ( WIN_X - 56 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- HelpButton BTN_PASSWORD_HELP
- {
- Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
-};
-
#define PAGE_X_T (PAGE_X -80)
#define PAGE_Y_T (PAGE_Y -50)
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index e9d1eb0..0eebf9c 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -97,7 +97,6 @@
#define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21
// FREE
#define DLG_PASSWORD RID_DIALOG_START + 23
-#define DLG_DOMAINPASSWORD RID_DIALOG_START + 24
#define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26
#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27
#define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 0277110..7135148 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -132,7 +132,7 @@
#define RID_APPTITLE (RID_SFX_START+4)
-#define DLG_DOCINFO_EDT (RID_SFX_START+6)
+
#define DLG_STYLE_DESIGNER (RID_SFX_START+8)
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 73cf4c0..f6281e1 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -60,7 +60,6 @@
#define RID_SVXIMG_NAVIGATIONBAR SID_FM_NAVIGATIONBAR
// Dialog-Id's -----------------------------------------------------------
-#define RID_SVXDLG_SETFORM (RID_FORMS_START + 5)
#define RID_SVX_FMEXPLORER (RID_FORMS_START + 6)
#define RID_SVXDLG_ADD_DATAITEM (RID_FORMS_START + 12)
#define RID_SVXDLG_ADD_CONDITION (RID_FORMS_START + 13)
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index f62e0bd..b6e1ba1 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -178,7 +178,6 @@
#define HID_DLG_INSERT_PAGES_OBJS "SD_HID_DLG_INSERT_PAGES_OBJS"
#define HID_VECTORIZE_DLG "SD_HID_VECTORIZE_DLG"
-#define HID_UNDO_DELETE_WARNING "SD_HID_UNDO_DELETE_WARNING"
#define HID_MN_SUB_GRAPHIC "SD_HID_MN_SUB_GRAPHIC"
#define HID_MN_SUB_FIELD "SD_HID_MN_SUB_FIELD"
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index eb6b959..4c58d73 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -427,48 +427,6 @@ String STR_EDIT_OBJ
{
Text [ en-US ] = "~Edit" ;
};
-ModalDialog RID_UNDO_DELETE_WARNING
-{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 175 + 39 + (3 * 6), (7 * 12) + 6 );
- Moveable = TRUE;
- Closeable = TRUE;
-
- HelpID = HID_UNDO_DELETE_WARNING;
-
- FixedImage IMG_UNDO_DELETE_WARNING
- {
- Pos = MAP_APPFONT( 6, 6 );
- Size = MAP_APPFONT( 30, 30 );
- };
- FixedText FT_UNDO_DELETE_WARNING
- {
- Pos = MAP_APPFONT( 39, 6 );
- Size = MAP_APPFONT( 175, 4 * 12 );
- WordBreak = TRUE;
- Text [ en-US ] = "This action deletes the list of actions that can\nbe undone. Previous changes made to the document are still valid,\nbut cannot be undone. Do you want to continue and\nthus assign the new slide design?";
- };
- CheckBox CB_UNDO_DELETE_DISABLE
- {
- HelpID = "sd:CheckBox:RID_UNDO_DELETE_WARNING:CB_UNDO_DELETE_DISABLE";
- Pos = MAP_APPFONT( 39, (4 * 12) + 9 );
- Size = MAP_APPFONT( 175, 12 );
- Text [ en-US ] = "~Do not show this warning again";
- };
- OKButton BTN_UNDO_DELETE_YES
- {
- Pos = MAP_APPFONT( 60, (5 * 12) + 13 );
- Size = MAP_APPFONT( 50, 14 );
- };
- CancelButton BTN_UNDO_DELETE_NO
- {
- Pos = MAP_APPFONT( 120, (5 * 12) + 13 );
- Size = MAP_APPFONT( 50, 14 );
- DefButton = TRUE;
- };
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION";
-};
-
String STR_DELETE_PAGES
{
Text [ en-US ] = "Delete slides" ;
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 19816b9..819d31d 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -329,13 +329,6 @@
//free (RID_APP_START+557)
-#define RID_UNDO_DELETE_WARNING (RID_APP_START+558)
-#define IMG_UNDO_DELETE_WARNING (RID_APP_START+559)
-#define FT_UNDO_DELETE_WARNING (RID_APP_START+560)
-#define CB_UNDO_DELETE_DISABLE (RID_APP_START+561)
-#define BTN_UNDO_DELETE_YES (RID_APP_START+562)
-#define BTN_UNDO_DELETE_NO (RID_APP_START+564)
-
#define STR_WARNING_NOSOUNDFILE (RID_APP_START+565)
#define STR_UNDO_GRAFFILTER (RID_APP_START+570)
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index c996a7f..5deaab6 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/dialog/alienwarn.src \
sfx2/source/dialog/dialog.src \
sfx2/source/dialog/dinfdlg.src \
- sfx2/source/dialog/dinfedt.src \
sfx2/source/dialog/filedlghelper.src \
sfx2/source/dialog/inputdlg.src \
sfx2/source/dialog/mailwindow.src \
diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
index 24ac72c..726b7ad 100644
--- a/sfx2/source/dialog/dinfedt.cxx
+++ b/sfx2/source/dialog/dinfedt.cxx
@@ -22,7 +22,6 @@
#include "sfx2/sfxresid.hxx"
#include <sfx2/sfx.hrc>
-#include "dinfedt.hrc"
// class InfoEdit_Impl ---------------------------------------------------
diff --git a/sfx2/source/dialog/dinfedt.hrc b/sfx2/source/dialog/dinfedt.hrc
deleted file mode 100644
index a77da97..0000000
--- a/sfx2/source/dialog/dinfedt.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- 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 .
- */
-#define BT_OK 1
-#define BT_CANCEL 2
-#define BTN_HELP 3
-#define FT_INFO1 4
-#define ED_INFO1 5
-#define FT_INFO2 6
-#define ED_INFO2 7
-#define FT_INFO3 8
-#define ED_INFO3 9
-#define FT_INFO4 10
-#define ED_INFO4 11
-#define FL_INFO 12
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dinfedt.src b/sfx2/source/dialog/dinfedt.src
deleted file mode 100644
index 4df2a90..0000000
--- a/sfx2/source/dialog/dinfedt.src
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- 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 <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include "dinfedt.hrc"
-
-ModalDialog DLG_DOCINFO_EDT
-{
- HelpId = HID_DOCINFO_EDT ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 166 , 79 ) ;
- Text [ en-US ] = "Edit Field Names" ;
- Moveable = TRUE ;
- FixedLine FL_INFO
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 98 , 8 ) ;
- Text [ en-US ] = "Names" ;
- };
- Edit ED_INFO1
- {
- HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 86 , 12 ) ;
- };
- Edit ED_INFO2
- {
- HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 29 ) ;
- Size = MAP_APPFONT ( 86 , 12 ) ;
- };
- Edit ED_INFO3
- {
- HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 44 ) ;
- Size = MAP_APPFONT ( 86 , 12 ) ;
- };
- Edit ED_INFO4
- {
- HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 59 ) ;
- Size = MAP_APPFONT ( 86 , 12 ) ;
- };
- OKButton BT_OK
- {
- Pos = MAP_APPFONT ( 110 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BT_CANCEL
- {
- Pos = MAP_APPFONT ( 110 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 110 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 89081e0..575579e 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -23,7 +23,6 @@
// Help-Ids -----------------------------------------------------------------
-#define HID_DOCINFO_EDT "SFX2_HID_DOCINFO_EDT"
#define HID_PRINTMONITOR "SFX2_HID_PRINTMONITOR"
#define HID_CONFIG_EVENT "SFX2_HID_CONFIG_EVENT"
#define HID_BROWSERCONTROL "SFX2_HID_BROWSERCONTROL"
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 2fb0bcd..e6b203b 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -290,45 +290,6 @@ ImageList RID_SVXIMGLIST_FMEXPL
NAVIGATOR_IMAGEIDS;
};
-ModalDialog RID_SVXDLG_SETFORM
-{
- HelpID = "svx:ModalDialog:RID_SVXDLG_SETFORM";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 200 , 200 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- GroupBox GB_PATH
- {
- Pos = MAP_APPFONT ( 6 , 149 ) ;
- Size = MAP_APPFONT ( 188 , 25 ) ;
- Text [ en-US ] = "Path" ;
- };
- FixedText FT_PATH
- {
- Pos = MAP_APPFONT ( 12 , 155 ) ;
- Size = MAP_APPFONT ( 156 , 15 ) ;
- };
- OKButton PB_OK
- {
- Pos = MAP_APPFONT ( 6 , 180 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- CancelButton PB_CANCEL
- {
- Pos = MAP_APPFONT ( 59 , 180 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton PB_HELP
- {
- Pos = MAP_APPFONT ( 123 , 180 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- Text [ en-US ] = "Select form" ;
-};
DockingWindow RID_SVX_FMEXPLORER
{
HelpID = "svx:DockingWindow:RID_SVX_FMEXPLORER";
More information about the Libreoffice-commits
mailing list