[Libreoffice-commits] core.git: 6 commits - basegfx/inc basegfx/Library_basegfx.mk basegfx/source basic/source linguistic/source sc/source sfx2/inc sfx2/source svtools/inc svtools/source svx/AllLangResTarget_svx.mk svx/inc svx/source svx/uiconfig unotools/inc unotools/source vcl/inc vcl/source xmlsecurity/inc xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Mon Mar 4 03:28:57 PST 2013
basegfx/Library_basegfx.mk | 1
basegfx/inc/basegfx/pixel/bpixel.hxx | 3
basegfx/inc/basegfx/raster/bpixelraster.hxx | 16
basegfx/source/pixel/bpixel.cxx | 39 -
basic/source/classes/sb.cxx | 19
linguistic/source/dicimp.cxx | 10
linguistic/source/dicimp.hxx | 2
sc/source/ui/dbgui/csvcontrol.cxx | 8
sc/source/ui/inc/csvcontrol.hxx | 1
sc/source/ui/pagedlg/tphf.cxx | 8
sfx2/inc/sfx2/tabdlg.hxx | 1
sfx2/source/dialog/tabdlg.cxx | 9
svtools/inc/svtools/ctrlbox.hxx | 1
svtools/source/control/ctrlbox.cxx | 10
svx/AllLangResTarget_svx.mk | 1
svx/inc/helpid.hrc | 2
svx/inc/svx/dialogs.hrc | 2
svx/inc/svx/hdft.hxx | 7
svx/source/dialog/hdft.cxx | 34 -
svx/source/dialog/hdft.src | 26
svx/uiconfig/ui/headfootformatpage.ui | 696 ++++++++++++--------------
unotools/inc/unotools/moduleoptions.hxx | 1
unotools/source/config/moduleoptions.cxx | 7
vcl/inc/vcl/edit.hxx | 1
vcl/inc/vcl/fixed.hxx | 1
vcl/inc/vcl/svapp.hxx | 1
vcl/inc/window.h | 2
vcl/source/app/brand.cxx | 37 -
vcl/source/app/svapp.cxx | 7
vcl/source/control/edit.cxx | 19
vcl/source/control/fixed.cxx | 19
vcl/source/window/window.cxx | 8
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 1
xmlsecurity/source/dialogs/macrosecurity.cxx | 6
34 files changed, 391 insertions(+), 615 deletions(-)
New commits:
commit bf48090e0a81c6490ee938eabaef4e791df85229
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 4 11:21:29 2013 +0000
discard explicit SetAccessibleRelationMemberOf when members of a true VclFrame
I think the old use of "SetAccessibleRelationMemberOf" is a kind of workaround
to show that those widgets are logically all children of a pseudo-frame in the
a11y view. Now that they are truly children of a real frame I think we don't
need them anymore.
If it turns out that being implicit children of a frame isn't sufficient for
a11y, then hopefully we don't need to manually insert them everywhere but
instead make one centralized change down in vcl to automatically present
children of frame as "AccessibleRelationMemberOf"s.
RID_SVXQBX_DELETE_HEADFOOT: This one is still in use, so I added it back
Change-Id: I00df4bd376ba21b7cdc2af87763f7c9ae015b70a
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 2c62c9b..e754226 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -58,7 +58,7 @@ ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId )
nPageUsage ( (sal_uInt16)SVX_PAGE_ALL ),
pStyleDlg ( NULL )
{
- get(m_pBtnEdit,"buttonEdit");
+ get(m_pBtnEdit, "buttonEdit");
SetExchangeSupport();
@@ -83,8 +83,6 @@ ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId )
m_pBtnEdit->SetHelpId( HID_SC_HEADER_EDIT );
else
m_pBtnEdit->SetHelpId( HID_SC_FOOTER_EDIT );
-
- m_pBtnEdit->SetAccessibleRelationMemberOf(m_pFrm);
}
//------------------------------------------------------------------
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 6591df1..ca50785 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/dialog/docrecovery.src \
svx/source/dialog/fontwork.src \
svx/source/dialog/frmsel.src \
+ svx/source/dialog/hdft.src \
svx/source/dialog/imapdlg.src \
svx/source/dialog/langbox.src \
svx/source/dialog/language.src \
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index a310c79..b1f1fde 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -72,8 +72,6 @@
#define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX"
#define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY"
#define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT"
-#define HID_FORMAT_FOOTER "SVX_HID_FORMAT_FOOTER"
-#define HID_FORMAT_HEADER "SVX_HID_FORMAT_HEADER"
// free
#define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW"
#define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW"
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index fa41623..d41157c 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -159,8 +159,6 @@
#define RID_SVXDLG_SEARCH (RID_SVX_START + 20)
// ResId fuer die PageDialog
-#define RID_SVXPAGE_FOOTER (RID_SVX_START + 26)
-#define RID_SVXPAGE_HEADER (RID_SVX_START + 27)
#define RID_SVXQBX_DELETE_HEADFOOT (RID_SVX_START + 28)
// ResId's fuer Dialoge aus StarDraw
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index 57924c1..bb1d2f5 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -59,7 +59,6 @@ protected:
SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId );
- VclFrame* m_pFrm;
FixedText* m_pPageLbl;
CheckBox* m_pTurnOnBox;
CheckBox* m_pCntSharedBox;
@@ -77,12 +76,6 @@ protected:
SvxPageWindow* m_pBspWin;
PushButton* m_pBackgroundBtn;
- FixedText* m_pFooterOn;
- FixedText* m_pFooterLbl;
- FixedText* m_pHeaderOn;
- FixedText* m_pHeaderLbl;
- FixedText* m_pMsg;
-
sal_uInt16 nId;
SfxItemSet* pBBSet;
sal_Bool bDisableQueryBox;
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 3a08520..79d0eaf 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -164,9 +164,6 @@ SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId
bEnableBackgroundSelector ( sal_True )
{
- get(m_pFrm,"frameHdrOn");
- get(m_pPageLbl,"labelHeaderFooterFormat");
- get(m_pTurnOnBox,"checkHeaderOn");
get(m_pCntSharedBox,"checkSameLR");
get(m_pCntSharedFirstBox,"checkSameFP");
get(m_pLMEdit,"spinMargLeft");
@@ -182,23 +179,19 @@ SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId
get(m_pBspWin,"drawingareaPageHF");
get(m_pBackgroundBtn,"buttonMore");
- get(m_pFooterOn,"labelFooterOn");
- get(m_pFooterLbl,"labelFooter");
- get(m_pHeaderOn,"labelHeaderOn");
- get(m_pHeaderLbl,"labelHeader");
- get(m_pMsg,"labelMsg");
-
//swap header <-> footer in UI
if(nId == SID_ATTR_PAGE_FOOTERSET)
{
- m_pPageLbl->SetText(m_pFooterLbl->GetText());
- m_pTurnOnBox->SetText(m_pFooterOn->GetText());
+ get(m_pPageLbl,"labelFooterFormat");
+ get(m_pTurnOnBox, "checkFooterOn");
}
else //Header
{
- m_pPageLbl->SetText(m_pHeaderLbl->GetText());
- m_pTurnOnBox->SetText(m_pHeaderOn->GetText());
+ get(m_pPageLbl,"labelHeaderFormat");
+ get(m_pTurnOnBox, "checkHeaderOn");
}
+ m_pTurnOnBox->Show();
+ m_pPageLbl->Show();
InitHandler();
m_pBspWin->EnableRTL( sal_False );
@@ -213,21 +206,6 @@ SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId
SetFieldUnit( *m_pHeightEdit, eFUnit );
SetFieldUnit( *m_pLMEdit, eFUnit );
SetFieldUnit( *m_pRMEdit, eFUnit );
-
- m_pTurnOnBox->SetAccessibleRelationMemberOf( m_pFrm );
- m_pCntSharedBox->SetAccessibleRelationMemberOf( m_pFrm );
- m_pCntSharedFirstBox->SetAccessibleRelationMemberOf( m_pFrm );
- m_pLMLbl->SetAccessibleRelationMemberOf( m_pFrm );
- m_pLMEdit->SetAccessibleRelationMemberOf( m_pFrm );
- m_pRMLbl->SetAccessibleRelationMemberOf( m_pFrm );
- m_pRMEdit->SetAccessibleRelationMemberOf( m_pFrm );
- m_pDistFT->SetAccessibleRelationMemberOf( m_pFrm );
- m_pDistEdit->SetAccessibleRelationMemberOf( m_pFrm );
- m_pDynSpacingCB->SetAccessibleRelationMemberOf( m_pFrm );
- m_pHeightFT->SetAccessibleRelationMemberOf( m_pFrm );
- m_pHeightEdit->SetAccessibleRelationMemberOf( m_pFrm );
- m_pHeightDynBtn->SetAccessibleRelationMemberOf( m_pFrm );
- m_pBackgroundBtn->SetAccessibleRelationMemberOf(m_pFrm);
}
// -----------------------------------------------------------------------
diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src
new file mode 100644
index 0000000..70fd30f
--- /dev/null
+++ b/svx/source/dialog/hdft.src
@@ -0,0 +1,26 @@
+/*
+ * 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 <svx/dialogs.hrc>
+
+QueryBox RID_SVXQBX_DELETE_HEADFOOT
+{
+ Buttons = WB_YES_NO ;
+ DefButton = WB_DEF_NO ;
+ Message [ en-US ] = "Removing headers or footers deletes the contents.\nDo you want to delete this text?" ;
+};
diff --git a/svx/uiconfig/ui/headfootformatpage.ui b/svx/uiconfig/ui/headfootformatpage.ui
index b6a26ba..28234fc 100644
--- a/svx/uiconfig/ui/headfootformatpage.ui
+++ b/svx/uiconfig/ui/headfootformatpage.ui
@@ -2,11 +2,24 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">99.989999999999995</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="lower">0.10000000000000001</property>
+ <property name="upper">99.989999999999995</property>
+ <property name="value">0.5</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkGrid" id="HFFormatPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
<property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -30,19 +43,50 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
<property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="checkHeaderOn">
- <property name="label" translatable="yes">Hea_der on</property>
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="checkHeaderOn">
+ <property name="label" translatable="yes">Hea_der on</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFooterOn">
+ <property name="label" translatable="yes">_Footer on</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -51,250 +95,270 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frameHdrOn">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="hexpand">True</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
<property name="valign">start</property>
- <property name="left_padding">12</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="checkSameLR">
+ <property name="label" translatable="yes">Same _content left/right</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
<child>
- <object class="GtkGrid" id="grid5">
+ <object class="GtkCheckButton" id="checkSameFP">
+ <property name="label" translatable="yes">Same content on first page</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelLeftMarg">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="valign">start</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkCheckButton" id="checkSameLR">
- <property name="label" translatable="yes">Same _content left/right</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkSameFP">
- <property name="label" translatable="yes">Same content on first page</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelLeftMarg">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Left margin:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinMargLeft:0.00cm</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinMargLeft:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelRightMarg">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">R_ight margin:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinMargRight:0.00cm</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinMargRight:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelSpacing">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Spacing:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinSpacing:0.00cm</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinSpacing:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkDynSpacing">
- <property name="label" translatable="yes">Use d_ynamic spacing</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelHeight">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Height:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinHeight:0.00cm</property>
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinHeight:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Left margin:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinMargLeft:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinMargLeft:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelRightMarg">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">R_ight margin:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinMargRight:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinMargRight:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelSpacing">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Spacing:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinSpacing:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinSpacing:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkDynSpacing">
+ <property name="label" translatable="yes">Use d_ynamic spacing</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelHeight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Height:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinHeight:0.00cm</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinHeight:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkAutofit">
+ <property name="label" translatable="yes">_AutoFit height</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">start</property>
<child>
- <object class="GtkCheckButton" id="checkAutofit">
- <property name="label" translatable="yes">_AutoFit height</property>
+ <object class="GtkButton" id="buttonMore">
+ <property name="label" translatable="yes">More...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="receives_default">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="buttonMore">
- <property name="label" translatable="yes">More...</property>
- <property name="visible">True</property>
+ <object class="GtkButton" id="buttonEdit">
+ <property name="label">_Edit...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.51999998092651367</property>
+ <property name="always_show_image">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">8</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
</child>
- <child type="label_item">
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -307,14 +371,42 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="labelHeaderFooterFormat">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Header</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="labelHeaderFormat">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Header</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelFooterFormat">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Footer</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -326,135 +418,34 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid1">
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="labelFooterOn">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Footer on</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelFooter">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Footer</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelHeaderOn">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Header on</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelHeader">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Header</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel" id="labelMsg">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Removing headers or footers deletes the contents.
-Do you want to delete this text?</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="left_padding">6</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">6</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="svxlo-SvxPageWindow" id="drawingareaPageHF">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="svxlo-SvxPageWindow" id="drawingareaPageHF">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="buttonEdit">
- <property name="label">gtk-edit</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <property name="xalign">0.51999998092651367</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
- <child type="label_item">
- <placeholder/>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -463,15 +454,8 @@ Do you want to delete this text?</property>
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<property name="ignore_hidden">True</property>
- <widgets>
- <widget name="spinMargLeft:0.00cm"/>
- <widget name="frame2"/>
- </widgets>
</object>
</interface>
commit 2cc80091f7da7ff874f2de9f0c738721fa041b76
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 1 13:48:01 2013 +0000
GraveFocus->GrabFocus
Change-Id: If60c593cff51a3c0d29d423746054ec8f4c796e5
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 18e23b8..2c62c9b 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -181,8 +181,8 @@ IMPL_LINK_NOARG(ScHFPage, TurnOnHdl)
IMPL_LINK_NOARG(ScHFPage, BtnHdl)
{
- // When the Edit-Dialog is directly called up from the Button's Click-Handler,
- // the GraveFocus from the Edit-Dialog under OS/2 doesn't work.(Bug #41805#).
+ // When the Edit-Dialog is directly called from the Button's Click-Handler,
+ // the GrabFocus from the Edit-Dialog under OS/2 doesn't work.(Bug #41805#).
// With the new StarView, this workaround should be again considered!
Application::PostUserEvent( LINK( this, ScHFPage, HFEditHdl ) );
commit ecda52f6b3919950870f3ddb195d34d3baf71168
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 4 09:22:56 2013 +0000
callcatcher: unused code
Change-Id: I7dcaa6f57815321e108cd7ce284fe145dc0506f2
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index fd725d6..3437881 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -69,14 +69,6 @@ ScCsvControl::ScCsvControl( ScCsvControl& rParent ) :
{
}
-ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, const ResId& rResId ) :
- Control( pParent, rResId ),
- mrData( rData ),
- mpAccessible( NULL ),
- mbValidGfx( false )
-{
-}
-
ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ) :
Control( pParent, nBits ),
mrData( rData ),
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index afdfed5..06eebea 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -267,7 +267,6 @@ private:
// ------------------------------------------------------------------------
public:
explicit ScCsvControl( ScCsvControl& rParent );
- explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, const ResId& rResId );
explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits );
virtual ~ScCsvControl();
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index d25a72c..e637187 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -252,7 +252,6 @@ private:
protected:
SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet);
- SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet );
sal_uInt16 GetSlot( sal_uInt16 nWhich ) const
{ return pSet->GetPool()->GetSlotId( nWhich ); }
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 4ec5a76..3d579fb 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -239,15 +239,6 @@ SfxTabPage::SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUSt
}
// -----------------------------------------------------------------------
-SfxTabPage:: SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ) :
- TabPage(pParent, nStyle),
- pSet ( &rAttrSet ),
- bHasExchangeSupport ( sal_False ),
- pTabDlg ( NULL ),
- pImpl ( new TabPageImpl )
-{
-}
-// -----------------------------------------------------------------------
SfxTabPage::~SfxTabPage()
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 0a8e566..81f0cff 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -435,7 +435,6 @@ protected:
public:
FontNameBox( Window* pParent,
WinBits nWinStyle = WB_SORT );
- FontNameBox( Window* pParent, const ResId& rResId );
virtual ~FontNameBox();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index bb35ebc..c46932e 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1048,16 +1048,6 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) :
InitFontMRUEntriesFile();
}
-// -------------------------------------------------------------------
-
-FontNameBox::FontNameBox( Window* pParent, const ResId& rResId ) :
- ComboBox( pParent, rResId )
-{
- mpFontList = NULL;
- mbWYSIWYG = sal_False;
- InitFontMRUEntriesFile();
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap)
{
bool bDropdown = extractDropdown(rMap);
diff --git a/unotools/inc/unotools/moduleoptions.hxx b/unotools/inc/unotools/moduleoptions.hxx
index 3fd6297..ba77ba0 100644
--- a/unotools/inc/unotools/moduleoptions.hxx
+++ b/unotools/inc/unotools/moduleoptions.hxx
@@ -106,7 +106,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail::
sal_Bool IsModuleInstalled ( EModule eModule ) const;
::rtl::OUString GetModuleName ( EModule eModule ) const;
::rtl::OUString GetFactoryName ( EFactory eFactory ) const;
- ::rtl::OUString GetFactoryShortName ( EFactory eFactory ) const;
::rtl::OUString GetFactoryStandardTemplate( EFactory eFactory ) const;
::rtl::OUString GetFactoryEmptyDocumentURL( EFactory eFactory ) const;
::rtl::OUString GetFactoryDefaultFilter ( EFactory eFactory ) const;
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 9dbd2df..2ff9624 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -1049,13 +1049,6 @@ sal_Bool SvtModuleOptions::IsModuleInstalled( EModule eModule ) const
}
//*****************************************************************************************************************
-::rtl::OUString SvtModuleOptions::GetFactoryShortName( EFactory eFactory ) const
-{
- ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
- return m_pDataContainer->GetFactoryShortName( eFactory );
-}
-
-//*****************************************************************************************************************
::rtl::OUString SvtModuleOptions::GetFactoryStandardTemplate( EFactory eFactory ) const
{
::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 178e3d8..434e428 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -149,7 +149,6 @@ public:
Edit( Window* pParent, WinBits nStyle = WB_BORDER );
Edit( Window* pParent, const ResId& rResId );
- Edit( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabeledByRelation );
virtual ~Edit();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index efa5f92..c45762f 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -61,7 +61,6 @@ protected:
public:
FixedText( Window* pParent, WinBits nStyle = 0 );
FixedText( Window* pParent, const ResId& rResId );
- FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation );
~FixedText();
virtual void Paint( const Rectangle& rRect );
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index e3e0779..ef92985 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -261,7 +261,6 @@ public:
static void SetAppName( const String& rUniqueName );
static String GetAppName();
static bool LoadBrandBitmap (const char* pName, BitmapEx &rBitmap);
- static bool LoadBrandSVG( const char *pName, BitmapEx &rBitmap );
// default name of the application for message dialogs and printing
static void SetDisplayName( const OUString& rDisplayName );
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index e6b669d..493863d 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -391,8 +391,6 @@ public:
mbIsInTaskPaneList:1,
mbToolbarFloatingWindow:1,
mbCallHandlersDuringInputDisabled:1,
- mbDisableAccessibleLabelForRelation:1,
- mbDisableAccessibleLabeledByRelation:1,
mbHelpTextDynamic:1,
mbFakeFocusSet:1,
mbHexpand:1,
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 50b606e..007496a 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -45,19 +45,6 @@ namespace {
loadPng( rBaseDir + "/program/edition" + rName, rBitmap) ||
loadPng( rBaseDir + "/program" + rName, rBitmap);
}
- static bool loadSvg( const OUString & rPath, BitmapEx &rBitmap)
- {
- INetURLObject aObj( rPath );
- SvgData aSvgData(aObj.PathToFileName());
- rBitmap = aSvgData.getReplacement();
- return !rBitmap.IsEmpty();
- }
- static bool tryLoadSvg( const OUString& rBaseDir, const OUString& rName, BitmapEx& rBitmap )
- {
- return
- loadSvg( rBaseDir + "/program/edition" + rName, rBitmap) ||
- loadSvg( rBaseDir + "/program" + rName, rBitmap);
- }
}
bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
@@ -86,28 +73,4 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
return false;
}
-bool Application::LoadBrandSVG (const char *pName, BitmapEx &rBitmap)
-{
- OUString aBaseDir( "$BRAND_BASE_DIR");
- rtl::Bootstrap::expandMacros( aBaseDir );
- rtl::OUString aBaseName( "/" + rtl::OUString::createFromAscii( pName ) );
- rtl::OUString aSvg( ".svg" );
-
- rtl_Locale *pLoc = NULL;
- osl_getProcessLocale (&pLoc);
- LanguageTag aLanguageTag( *pLoc);
-
- ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings());
- for (size_t i=0; i < aFallbacks.size(); ++i)
- {
- if (tryLoadSvg( aBaseDir, aBaseName + "-" + aFallbacks[i] + aSvg, rBitmap))
- return true;
- }
-
- if (tryLoadSvg( aBaseDir, aBaseName + aSvg, rBitmap))
- return true;
-
- return false;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 90166eb..f884d56 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1647,13 +1647,6 @@ void Application::SetFilterHdl( const Link& rLink )
// -----------------------------------------------------------------------
-const Link& Application::GetFilterHdl()
-{
- return ImplGetSVData()->maGDIData.mpGrfConverter->GetFilterHdl();
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool ImplCallHotKey( const KeyCode& rKeyCode )
{
ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 8f19c3c..f1cbc95 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -253,25 +253,6 @@ bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
// -----------------------------------------------------------------------
-Edit::Edit( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabeledByRelation ) :
- Control( WINDOW_EDIT )
-{
- ImplInitEditData();
- rResId.SetRT( RSC_EDIT );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
- if ( bDisableAccessibleLabeledByRelation )
- ImplGetWindowImpl()->mbDisableAccessibleLabeledByRelation = sal_True;
-
- // Derived MultiLineEdit takes care to call Show only after MultiLineEdit
- // ctor has already started:
- if ( !(nStyle & WB_HIDE) && rResId.GetRT() != RSC_MULTILINEEDIT )
- Show();
-}
-
-// -----------------------------------------------------------------------
-
Edit::~Edit()
{
delete mpDDInfo;
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index f1d1957..b6a4d10 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -175,25 +175,6 @@ FixedText::FixedText( Window* pParent, const ResId& rResId )
// -----------------------------------------------------------------------
-FixedText::FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation )
- : Control( WINDOW_FIXEDTEXT )
- , m_nMaxWidthChars(-1)
- , m_nMinWidthChars(-1)
- , m_pMnemonicWindow(NULL)
-{
- rResId.SetRT( RSC_TEXT );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
- if ( bDisableAccessibleLabelForRelation )
- ImplGetWindowImpl()->mbDisableAccessibleLabelForRelation = sal_True;
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle )
{
sal_uInt16 nTextStyle = TEXT_DRAW_MNEMONIC | TEXT_DRAW_ENDELLIPSIS;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 31d3a48..47437dd 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -711,8 +711,6 @@ void Window::ImplInitWindowData( WindowType nType )
mpWindowImpl->mbIsInTaskPaneList = sal_False; // sal_True: window was added to the taskpanelist in the topmost system window
mpWindowImpl->mnNativeBackground = 0; // initialize later, depends on type
mpWindowImpl->mbCallHandlersDuringInputDisabled = sal_False; // sal_True: call event handlers even if input is disabled
- mpWindowImpl->mbDisableAccessibleLabelForRelation = sal_False; // sal_True: do not set LabelFor relation on accessible objects
- mpWindowImpl->mbDisableAccessibleLabeledByRelation = sal_False; // sal_True: do not set LabeledBy relation on accessible objects
mpWindowImpl->mbHelpTextDynamic = sal_False; // sal_True: append help id in HELP_DEBUG case
mpWindowImpl->mbFakeFocusSet = sal_False; // sal_True: pretend as if the window has focus.
mpWindowImpl->mbHexpand = false;
@@ -9011,9 +9009,6 @@ Window* Window::GetAccessibleRelationMemberOf() const
Window* Window::getAccessibleRelationLabelFor() const
{
- if (mpWindowImpl->mbDisableAccessibleLabelForRelation)
- return NULL;
-
if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pLabelForWindow)
return mpWindowImpl->mpAccessibleInfos->pLabelForWindow;
@@ -9035,9 +9030,6 @@ Window* Window::GetAccessibleRelationLabelFor() const
Window* Window::GetAccessibleRelationLabeledBy() const
{
- if (mpWindowImpl->mbDisableAccessibleLabeledByRelation)
- return NULL;
-
if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pLabeledByWindow)
return mpWindowImpl->mpAccessibleInfos->pLabeledByWindow;
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 42cc9a7..8dc691e 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -92,7 +92,6 @@ protected:
public:
MacroSecurityTP(Window* _pParent, const OString& rID,
const OUString& rUIXMLDescription, MacroSecurity* _pDlg);
- MacroSecurityTP(Window* _pParent, const ResId& _rResId, MacroSecurity* _pDlg);
void SetTabDlg(MacroSecurity* pTabDlg)
{
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 3b3d924..fe77313 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -99,12 +99,6 @@ MacroSecurityTP::MacroSecurityTP(Window* _pParent, const OString& rID,
{
}
-MacroSecurityTP::MacroSecurityTP( Window* _pParent, const ResId& _rResId, MacroSecurity* _pDlg )
- :TabPage ( _pParent, _rResId )
- ,mpDlg ( _pDlg )
-{
-}
-
MacroSecurityLevelTP::MacroSecurityLevelTP(Window* _pParent, MacroSecurity* _pDlg)
: MacroSecurityTP(_pParent, "SecurityLevelPage", "xmlsec/ui/securitylevelpage.ui", _pDlg)
{
commit bef4b0dd6e638c1288c8855b514418e10ae19545
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 4 09:22:29 2013 +0000
DBG_ASSERT->SAL_WARN_IF
Change-Id: I33c82b9f8ca992d24966211b010675744934d5cb
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 886a826..1752a56 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -363,7 +363,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
}
}
- DBG_ASSERT(isSorted(), "lng : dictionary is not sorted");
+ SAL_WARN_IF(!isSorted(), "linguistic", "dictionary is not sorted");
// since this routine should be called only initialy (prior to any
// modification to be saved) we reset the bIsModified flag here that
@@ -650,9 +650,9 @@ sal_Bool DictionaryNeo::seekEntry(const OUString &rWord,
return sal_False;
}
-sal_Bool DictionaryNeo::isSorted()
+bool DictionaryNeo::isSorted()
{
- sal_Bool bRes = sal_True;
+ bool bRes = true;
const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
sal_Int32 nEntries = getCount();
@@ -662,7 +662,7 @@ sal_Bool DictionaryNeo::isSorted()
if (cmpDicEntry( pEntry[i-1]->getDictionaryWord(),
pEntry[i]->getDictionaryWord() ) > 0)
{
- bRes = sal_False;
+ bRes = false;
break;
}
}
@@ -709,7 +709,7 @@ sal_Bool DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > x
pEntry[ i+1 ] = pEntry[ i ];
// insert new entry at specified position
pEntry[ nPos ] = xDicEntry;
- DBG_ASSERT(isSorted(), "lng : dictionary entries unsorted");
+ SAL_WARN_IF(!isSorted(), "linguistic", "dictionary entries unsorted");
nCount++;
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 012f3fd..8ad6a69 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -76,7 +76,7 @@ class DictionaryNeo :
sal_Bool bSimilarOnly = sal_False);
sal_Bool seekEntry(const ::rtl::OUString &rWord, sal_Int32 *pPos,
sal_Bool bSimilarOnly = sal_False);
- sal_Bool isSorted();
+ bool isSorted();
sal_Bool addEntry_Impl(const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry > xDicEntry,
commit 23e572f47548c5465ccf588750fd614b59404f40
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 4 09:21:51 2013 +0000
don't do something different in dbgutil mode than product
Change-Id: Ibe0f41206ffaa3ff73018e49b4e710123c7fb14d
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a269c74..ed23b59 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -964,18 +964,13 @@ StarBASIC::~StarBASIC()
RemoveFactory( GetSbData()->pFormFac );
delete GetSbData()->pFormFac; GetSbData()->pFormFac = NULL;
-#ifdef DBG_UTIL
- // There is no need to clean SbiData at program end,
- // but we dislike MLK's at Purify
- // TODO: Where else???
- SbiGlobals** pp = (SbiGlobals**) ::GetAppData( SHL_SBC );
- SbiGlobals* p = *pp;
- if( p )
- {
- delete p;
- *pp = 0;
- }
-#endif
+ SbiGlobals** pp = (SbiGlobals**) ::GetAppData( SHL_SBC );
+ SbiGlobals* p = *pp;
+ if( p )
+ {
+ delete p;
+ *pp = 0;
+ }
}
else if( bDocBasic )
{
commit 3abfdd08caf588577c349f1e2cbe8778ec228c85
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 3 15:43:33 2013 +0000
it's surely a bad idea to not crash in dbgutil mode but crash in product mode
Change-Id: Ie72e23a5b3c49b08bcf25a9de2d7c4d4c4e7925d
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 303d437..21cfff6 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/matrix/b2dhommatrixtools \
basegfx/source/matrix/b3dhommatrix \
basegfx/source/numeric/ftools \
- basegfx/source/pixel/bpixel \
basegfx/source/point/b2dpoint \
basegfx/source/point/b2ipoint \
basegfx/source/point/b3dpoint \
diff --git a/basegfx/inc/basegfx/pixel/bpixel.hxx b/basegfx/inc/basegfx/pixel/bpixel.hxx
index a2c5910..09f0fea 100644
--- a/basegfx/inc/basegfx/pixel/bpixel.hxx
+++ b/basegfx/inc/basegfx/pixel/bpixel.hxx
@@ -125,9 +125,6 @@ namespace basegfx
{
return (rPixel.maPixelUnion.maCombinedRGBO.mnValue != maPixelUnion.maCombinedRGBO.mnValue);
}
-
- // empty element
- static const BPixel& getEmptyBPixel();
};
//////////////////////////////////////////////////////////////////////////
diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx
index 60a5d5a..ed7ac93 100644
--- a/basegfx/inc/basegfx/raster/bpixelraster.hxx
+++ b/basegfx/inc/basegfx/raster/bpixelraster.hxx
@@ -81,26 +81,14 @@ namespace basegfx
// data access read only
const BPixel& getBPixel(sal_uInt32 nIndex) const
{
-#ifdef DBG_UTIL
- if(nIndex >= mnCount)
- {
- OSL_FAIL("getBPixel: Access out of range (!)");
- return BPixel::getEmptyBPixel();
- }
-#endif
+ assert(nIndex < mnCount); //Access out of range
return mpContent[nIndex];
}
// data access read/write
BPixel& getBPixel(sal_uInt32 nIndex)
{
-#ifdef DBG_UTIL
- if(nIndex >= mnCount)
- {
- OSL_FAIL("getBPixel: Access out of range (!)");
- return mpContent[0L];
- }
-#endif
+ assert(nIndex < mnCount); //Access out of range
return mpContent[nIndex];
}
};
diff --git a/basegfx/source/pixel/bpixel.cxx b/basegfx/source/pixel/bpixel.cxx
deleted file mode 100644
index 8d993ba..0000000
--- a/basegfx/source/pixel/bpixel.cxx
+++ /dev/null
@@ -1,39 +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 <basegfx/pixel/bpixel.hxx>
-#include <rtl/instance.hxx>
-
-namespace { struct EmptyBPixel : public rtl::Static<basegfx::BPixel, EmptyBPixel> {}; }
-
-//////////////////////////////////////////////////////////////////////////////
-
-namespace basegfx
-{
- const BPixel& BPixel::getEmptyBPixel()
- {
- return EmptyBPixel::get();
- }
-
- //////////////////////////////////////////////////////////////////////////
- // external operators
-
-} // end of namespace basegfx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list