[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig extensions/source include/svx sc/source sd/source svx/inc svx/source sw/source
Thomas Arnhold
thomas at arnhold.org
Mon May 5 10:43:25 PDT 2014
cui/source/customize/cfg.src | 1
cui/uiconfig/ui/numberingoptionspage.ui | 2
cui/uiconfig/ui/numberingpositionpage.ui | 2
extensions/source/bibliography/toolbar.src | 6 -
include/svx/dialogs.hrc | 3
sc/source/ui/navipi/navipi.src | 3
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 1
sd/source/ui/dlg/LayerDialog.src | 2
sd/source/ui/dlg/navigatr.src | 5 -
svx/inc/helpid.hrc | 14 ---
svx/source/sidebar/area/AreaPropertyPanel.src | 2
svx/source/stbctrls/stbctrls.src | 4
svx/source/tbxctrls/grafctrl.cxx | 1
svx/source/tbxctrls/grafctrl.hrc | 22 ----
svx/source/tbxctrls/grafctrl.src | 87 -------------------
sw/source/core/uibase/dbui/mailmergechildwindow.src | 1
sw/source/core/uibase/utlui/navipi.src | 23 -----
17 files changed, 2 insertions(+), 177 deletions(-)
New commits:
commit 2fd90ea3e2e59d8a3474dd8ec085c99b85248d27
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 5 18:50:35 2014 +0200
add border to level list box for bullets and numbering
this is like it was pre ui conversion
Change-Id: Ie0fe230893dc448531a44c6d79c00b4a29120cba
diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
index 11338c0..720c9da 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -64,7 +64,7 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTreeView" id="levellb">
+ <object class="GtkTreeView" id="levellb:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui
index e7511bb..9d9e1d9 100644
--- a/cui/uiconfig/ui/numberingpositionpage.ui
+++ b/cui/uiconfig/ui/numberingpositionpage.ui
@@ -66,7 +66,7 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTreeView" id="levellb">
+ <object class="GtkTreeView" id="levellb:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
commit efa35b2b1120c7cf44791667776ea2b11759e291
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 5 10:44:40 2014 +0200
unused floating window RID_SVXTBX_GRFFILTER
Change-Id: I3b6d7091922ed345d24c15c5a52d37521792d551
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 9cf295b..fb417e6 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -319,9 +319,6 @@
// String-Arrays
#define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312)
-// Graphic filter
-#define RID_SVXTBX_GRFFILTER (RID_SVX_START + 331)
-
#define RID_SVXERRCODE (RID_SVX_START + 350)
// gallery
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 53a78e8..bc6d484 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -82,21 +82,7 @@
#define HID_GALLERY_PROPERTIES "SVX_HID_GALLERY_PROPERTIES"
#define HID_GALLERY_RENAME "SVX_HID_GALLERY_RENAME"
#define HID_GALLERY_THEMELIST "SVX_HID_GALLERY_THEMELIST"
-// free
#define HID_GALLERY_WINDOW "SVX_HID_GALLERY_WINDOW"
-#define HID_GRFFILTER "SVX_HID_GRFFILTER"
-#define HID_GRFFILTER_EMBOSS "SVX_HID_GRFFILTER_EMBOSS"
-#define HID_GRFFILTER_INVERT "SVX_HID_GRFFILTER_INVERT"
-#define HID_GRFFILTER_MOSAIC "SVX_HID_GRFFILTER_MOSAIC"
-#define HID_GRFFILTER_POPART "SVX_HID_GRFFILTER_POPART"
-#define HID_GRFFILTER_POSTER "SVX_HID_GRFFILTER_POSTER"
-#define HID_GRFFILTER_REMOVENOISE "SVX_HID_GRFFILTER_REMOVENOISE"
-#define HID_GRFFILTER_SEPIA "SVX_HID_GRFFILTER_SEPIA"
-#define HID_GRFFILTER_SHARPEN "SVX_HID_GRFFILTER_SHARPEN"
-#define HID_GRFFILTER_SMOOTH "SVX_HID_GRFFILTER_SMOOTH"
-#define HID_GRFFILTER_SOBEL "SVX_HID_GRFFILTER_SOBEL"
-#define HID_GRFFILTER_SOLARIZE "SVX_HID_GRFFILTER_SOLARIZE"
-
#define HID_IMAPDLG_ACTIVE "SVX_HID_IMAPDLG_ACTIVE"
#define HID_IMAPDLG_APPLY "SVX_HID_IMAPDLG_APPLY"
#define HID_IMAPDLG_CIRCLE "SVX_HID_IMAPDLG_CIRCLE"
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 325b26e..3a4ab6f 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -36,7 +36,6 @@
#include <comphelper/processfactory.hxx>
#include <svx/svxids.hrc>
-#include "grafctrl.hrc"
#include <svx/dialogs.hrc>
#include <editeng/brushitem.hxx>
#include <editeng/sizeitem.hxx>
diff --git a/svx/source/tbxctrls/grafctrl.hrc b/svx/source/tbxctrls/grafctrl.hrc
deleted file mode 100644
index 67cc073..0000000
--- a/svx/source/tbxctrls/grafctrl.hrc
+++ /dev/null
@@ -1,22 +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 TBX_GRFFILTER 1
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/grafctrl.src b/svx/source/tbxctrls/grafctrl.src
index 314a746..afa3777 100644
--- a/svx/source/tbxctrls/grafctrl.src
+++ b/svx/source/tbxctrls/grafctrl.src
@@ -17,94 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "grafctrl.hrc"
#include <svx/dialogs.hrc>
-#include "helpid.hrc"
-#include <svx/svxids.hrc>
-
-FloatingWindow RID_SVXTBX_GRFFILTER
-{
- HelpId = HID_GRFFILTER;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Filters" ;
- ToolBox TBX_GRFFILTER
- {
- SVLook = TRUE ;
- MenuStrings = TRUE ;
- Align = BOXALIGN_TOP;
- LineCount = 3;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_INVERT ;
- HelpID = HID_GRFFILTER_INVERT ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_SMOOTH ;
- HelpID = HID_GRFFILTER_SMOOTH ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_SHARPEN ;
- HelpID = HID_GRFFILTER_SHARPEN ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_REMOVENOISE ;
- HelpID = HID_GRFFILTER_REMOVENOISE ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_BREAK ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_SOLARIZE ;
- HelpId = HID_GRFFILTER_SOLARIZE ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_SEPIA ;
- HelpId = HID_GRFFILTER_SEPIA ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_POSTER ;
- HelpId = HID_GRFFILTER_POSTER ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_POPART ;
- HelpId = HID_GRFFILTER_POPART ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_BREAK ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_SOBEL ;
- HelpId = HID_GRFFILTER_SOBEL ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_EMBOSS ;
- HelpId = HID_GRFFILTER_EMBOSS ;
- };
- ToolBoxItem
- {
- Identifier = SID_GRFFILTER_MOSAIC ;
- HelpId = HID_GRFFILTER_MOSAIC ;
- };
- };
- };
-};
-
String RID_SVXSTR_UNDO_GRAFMODE
{
commit 1a0cdabf1d98d7479a27f12c56c0fa4160f7b5c3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 5 10:29:38 2014 +0200
remove some commented out lines from src files
Change-Id: If872737d2a7db5d9053a256f7e3d57007c24230e
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 2efab49..b85a24d 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -269,7 +269,6 @@ ModalDialog MD_ICONCHANGE
Pos = MAP_APPFONT ( 30 , 38) ;
Size = MAP_APPFONT ( 140 , 83 ) ;
Border = TRUE;
- // VScroll = TRUE;
IgnoreTab = TRUE;
ReadOnly = TRUE;
};
diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src
index 0c642c3..1c02b36 100644
--- a/extensions/source/bibliography/toolbar.src
+++ b/extensions/source/bibliography/toolbar.src
@@ -72,7 +72,6 @@ ToolBox RID_BIB_TOOLBAR
{
Identifier = TBC_BT_AUTOFILTER ;
HelpID = HID_BIB_TBX_AUTOFILTER;
-// ItemBitmap = Bitmap { File = "sc10716.bmp" ; };
DropDown = TRUE ;
Command = ".uno:Bib/autoFilter" ;
Text [ en-US ] = "AutoFilter";
@@ -81,7 +80,6 @@ ToolBox RID_BIB_TOOLBAR
ToolBoxItem
{
Identifier = TBC_BT_FILTERCRIT ;
-// ItemBitmap = Bitmap { File = "sc10715.bmp" ; };
Command = ".uno:Bib/standardFilter" ;
Text [ en-US ] = "Standard Filter";
};
@@ -89,7 +87,6 @@ ToolBox RID_BIB_TOOLBAR
ToolBoxItem
{
Identifier = TBC_BT_REMOVEFILTER ;
-// ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
Command = ".uno:Bib/removeFilter" ;
Text [ en-US ] = "Reset Filter";
};
@@ -97,8 +94,6 @@ ToolBox RID_BIB_TOOLBAR
{
Identifier = TBC_BT_COL_ASSIGN ;
HelpId = HID_BIB_MAPPINGDLG;
-// Command = ".uno:Bib/Mapping" ;
-// ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
Text [ en-US ] = "Column Arrangement";
};
ToolBoxItem
@@ -106,7 +101,6 @@ ToolBox RID_BIB_TOOLBAR
Identifier = TBC_BT_CHANGESOURCE ;
HelpId = HID_BIB_CHANGESOURCE;
Command = ".uno:Bib/sdbsource" ;
-// ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
Checkable=TRUE;
Text [ en-US ] = "Data Source";
};
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index 9a38df0..cbb59f4 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -148,9 +148,6 @@ Window RID_SCDLG_NAVIGATOR
Text [ en-US ] = "End" ;
};
- // ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR; };
-
-
ToolBoxItem { Type = TOOLBOXITEM_BREAK ; };
ToolBoxItem
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
index 272e4e4..f58b2ed 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
@@ -31,7 +31,6 @@
Image IMG_CELL_BORDER
{
ImageBitmap = Bitmap{File = "sidebar/CellBorder.png";};
- //MaskColor = STD_MASKCOLOR ;
};
Image IMG_LINE_STYLE1
{
diff --git a/sd/source/ui/dlg/LayerDialog.src b/sd/source/ui/dlg/LayerDialog.src
index 9200c7b0..05098c2 100644
--- a/sd/source/ui/dlg/LayerDialog.src
+++ b/sd/source/ui/dlg/LayerDialog.src
@@ -45,8 +45,6 @@ DockingWindow FLT_WIN_LAYER_DIALOG
HelpId = HID_SD_TABBAR_LAYERS;
BORDER = TRUE;
SvLook = TRUE;
- // Scroll = TRUE ;
- // SIZEABLE = TRUE;
};
};
diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src
index f534c3f..f0b6aad 100644
--- a/sd/source/ui/dlg/navigatr.src
+++ b/sd/source/ui/dlg/navigatr.src
@@ -62,28 +62,24 @@ Window FLT_NAVIGATOR
{
Identifier = TBI_FIRST ;
HelpId = HID_SD_NAVIGATOR_TBI_FIRST ;
- //Symbol = IMAGEBUTTON_FIRST ;
Text [ en-US ] = "First Slide" ;
};
ToolBoxItem
{
Identifier = TBI_PREVIOUS ;
HelpId = HID_SD_NAVIGATOR_TBI_PREV ;
- //Symbol = IMAGEBUTTON_PREV ;
Text [ en-US ] = "Previous Slide" ;
};
ToolBoxItem
{
Identifier = TBI_NEXT ;
HelpId = HID_SD_NAVIGATOR_TBI_NEXT ;
- //Symbol = IMAGEBUTTON_NEXT ;
Text [ en-US ] = "Next Slide" ;
};
ToolBoxItem
{
Identifier = TBI_LAST ;
HelpId = HID_SD_NAVIGATOR_TBI_LAST ;
- //Symbol = IMAGEBUTTON_LAST ;
Text [ en-US ] = "Last Slide" ;
};
ToolBoxItem
@@ -95,7 +91,6 @@ Window FLT_NAVIGATOR
Identifier = TBI_DRAGTYPE ;
HelpId = HID_SD_NAVIGATOR_TBI_DRAGTYPE ;
DropDown = TRUE ;
- //Left = FALSE;
Text [ en-US ] = "Drag Mode" ;
};
ToolBoxItem
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src
index 2a0fff9..0952590 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -67,8 +67,6 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
DialogControl = TRUE;
Border = FALSE;
-// Size = MAP_APPFONT( POP_WIDTH, POP_HEIGHT );
-
FixedText FT_TRGR_CENTER_X
{
Size = MAP_APPFONT ( CONTROL_WIDTH , FIXED_TEXT_HEIGHT ) ;
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 8d5beeb..cb868bd 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -44,28 +44,24 @@ Menu RID_SVXMENU_SELECTION
MenuItem
{
Identifier = SELECTION_STANDARD ;
- //HelpId = ;
RadioCheck = TRUE ;
Text [ en-US ] = "Standard selection" ;
};
MenuItem
{
Identifier = SELECTION_EXTENDED ;
- //HelpId = ;
RadioCheck = TRUE ;
Text [ en-US ] = "Extending selection" ;
};
MenuItem
{
Identifier = SELECTION_ADDED ;
- //HelpId = ;
RadioCheck = TRUE ;
Text [ en-US ] = "Adding selection" ;
};
MenuItem
{
Identifier = SELECTION_BLOCK ;
- //HelpId = ;
RadioCheck = TRUE ;
Text [ en-US ] = "Block selection" ;
};
diff --git a/sw/source/core/uibase/dbui/mailmergechildwindow.src b/sw/source/core/uibase/dbui/mailmergechildwindow.src
index 9e09618..e3dac45 100644
--- a/sw/source/core/uibase/dbui/mailmergechildwindow.src
+++ b/sw/source/core/uibase/dbui/mailmergechildwindow.src
@@ -70,7 +70,6 @@ FloatingWindow DLG_MAILMERGECHILD\
};
};
-//FloatingWindow DLG_MM_SENDMAILS
ModelessDialog DLG_MM_SENDMAILS
{
OutputSize = TRUE ;
diff --git a/sw/source/core/uibase/utlui/navipi.src b/sw/source/core/uibase/utlui/navipi.src
index 66bda96..e1b4e6d 100644
--- a/sw/source/core/uibase/utlui/navipi.src
+++ b/sw/source/core/uibase/utlui/navipi.src
@@ -29,25 +29,13 @@ Window DLG_NAVIGATION_PI
OutputSize = TRUE ;
DialogControl = TRUE ;
SVLook = TRUE ;
- // Size = MAP_PIXEL( 235, 195 );
- // ZoomInOutputSize = MAP_PIXEL(235, 56);
Size = MAP_PIXEL ( 282 , 59 ) ;
- // Closeable = TRUE ;
- // Zoomable = TRUE ;
- // Moveable = TRUE ;
- // ZoomIn = FALSE;
Hide = TRUE ;
- // HideWhenDeactivate = TRUE ;
- // Sizeable = TRUE ;
- // EnableResizing = TRUE ;
- // Dockable = TRUE ;
- // Sizeable = TRUE ;
Text [ en-US ] = "Navigator" ;
ExtraData =
{
198;
};
- // Toolbox from 323 x
#define NAVI_IDLIST \
IdList = \
{ \
@@ -105,14 +93,12 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_UP ;
- // ItemBitmap = Bitmap { File = "navup.bmp"; };
HelpID = HID_NAVI_TBX2 ;
Text [ en-US ] = "Back" ;
};
ToolBoxItem
{
Identifier = FN_DOWN ;
- // ItemBitmap = Bitmap { File = "navdn.bmp"; };
HelpID = HID_NAVI_TBX3 ;
Text [ en-US ] = "Forward" ;
};
@@ -130,15 +116,12 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_ITEM_UP ;
- // ItemBitmap = Bitmap { File = "navchup.bmp"; };
HelpID = HID_NAVI_TBX5 ;
Text [ en-US ] = "Promote Chapter" ;
- //HelpText[english_us-wrong] = "Move chapter down";//"Move chapter up"
};
ToolBoxItem
{
Identifier = FN_ITEM_DOWN ;
- // ItemBitmap = Bitmap { File = "navchdn.bmp"; };
HelpID = HID_NAVI_TBX6 ;
Text [ en-US ] = "Demote Chapter" ;
};
@@ -166,7 +149,6 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_SELECT_SET_AUTO_BOOKMARK ;
HelpID = HID_NAVI_TBX9 ;
- // ItemBitmap = Bitmap { File = "navstmp.bmp"; };
Text [ en-US ] = "Set Reminder" ;
};
ToolBoxItem
@@ -176,21 +158,18 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_SELECT_HEADER ;
- // ItemBitmap = Bitmap { File = "navhead.bmp"; };
HelpID = HID_NAVI_TBX10 ;
Text [ en-US ] = "Header" ;
};
ToolBoxItem
{
Identifier = FN_SELECT_FOOTER ;
- // ItemBitmap = Bitmap { File = "navfoot.bmp"; };
HelpID = HID_NAVI_TBX11 ;
Text [ en-US ] = "Footer" ;
};
ToolBoxItem
{
Identifier = FN_SELECT_FOOTNOTE ;
- // ItemBitmap = Bitmap { File = "navnote.bmp"; };
HelpID = HID_NAVI_TBX12 ;
Text [ en-US ] = "Anchor<->Text" ;
};
@@ -213,13 +192,11 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_ITEM_LEFT ;
HelpID = HID_NAVI_TBX14 ;
- // ItemBitmap = Bitmap { File = "navchlf.bmp"; };
Text [ en-US ] = "Promote Level" ;
};
ToolBoxItem
{
Identifier = FN_ITEM_RIGHT ;
- // ItemBitmap = Bitmap { File = "navchrg.bmp"; };
HelpID = HID_NAVI_TBX15 ;
Text [ en-US ] = "Demote Level" ;
};
More information about the Libreoffice-commits
mailing list