[Libreoffice-commits] core.git: 3 commits - chart2/source dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extensions/source fpicker/source include/sfx2 include/svtools include/svx include/tools include/vbahelper include/vcl sc/source sfx2/source svtools/source svx/source unusedcode.easy vbahelper/source vcl/source
Caolán McNamara
caolanm at redhat.com
Tue Jul 22 01:55:26 PDT 2014
chart2/source/controller/dialogs/DialogModel.cxx | 5
chart2/source/controller/dialogs/DialogModel.hxx | 1
dbaccess/UIConfig_dbaccess.mk | 2
dbaccess/source/ext/macromigration/dbmm_global.hrc | 5
dbaccess/source/ext/macromigration/macromigration.hrc | 43 --
dbaccess/source/ext/macromigration/macromigration.src | 161 --------
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 97 ++---
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 24 -
dbaccess/source/ext/macromigration/rangeprogressbar.hxx | 74 +--
dbaccess/uiconfig/ui/migratepage.ui | 242 +++++++++++++
dbaccess/uiconfig/ui/summarypage.ui | 90 ++++
extensions/source/dbpilots/controlwizard.cxx | 18
extensions/source/dbpilots/controlwizard.hxx | 1
fpicker/source/office/iodlg.cxx | 9
fpicker/source/office/iodlg.hxx | 1
include/sfx2/objface.hxx | 1
include/svtools/urlcontrol.hxx | 1
include/svx/sdr/attribute/sdrallfillattributeshelper.hxx | 1
include/tools/rc.h | 3
include/vbahelper/vbahelper.hxx | 3
include/vcl/fixed.hxx | 3
include/vcl/tabdlg.hxx | 2
sc/source/ui/inc/gridwin.hxx | 1
sc/source/ui/view/gridwin5.cxx | 13
sfx2/source/control/objface.cxx | 24 -
svtools/source/control/urlcontrol.cxx | 16
svx/source/sdr/attribute/sdrallfillattributeshelper.cxx | 9
unusedcode.easy | 50 +-
vbahelper/source/vbahelper/vbahelper.cxx | 6
vcl/source/control/fixed.cxx | 13
vcl/source/window/tabdlg.cxx | 8
31 files changed, 442 insertions(+), 485 deletions(-)
New commits:
commit 1f106a522ed7ebe67a0e310f48fdc09e272349d5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 22 09:47:15 2014 +0100
convert migrate page to .ui
Change-Id: I9a7871bfd08fdd8dc649d7a728eb41bcc0b64b37
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 08da251..cb76450 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/generatedvaluespage \
dbaccess/uiconfig/ui/indexdesigndialog \
dbaccess/uiconfig/ui/joindialog \
+ dbaccess/uiconfig/ui/migratepage \
dbaccess/uiconfig/ui/password \
dbaccess/uiconfig/ui/preparepage \
dbaccess/uiconfig/ui/queryfilterdialog \
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index fec924b..946b7a5 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -36,10 +36,6 @@
#define ERR_INVALID_BACKUP_LOCATION RID_DBMM_DIALOG_START + 0
-//= tab pages
-
-#define TP_MIGRATE ( RID_DBMM_TAPPAGE_START + 2 )
-
//= strings
#define STR_FORM ( RID_DBMM_STRING_START + 0 )
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc
index 334ef62..d63cf5b 100644
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ b/dbaccess/source/ext/macromigration/macromigration.hrc
@@ -24,46 +24,10 @@
#define TAB_PAGE_WIDTH 280
#define TAB_PAGE_HEIGHT 185
-// margin between the tab page and its content
-#define TAB_PAGE_CONTENT_MARGIN 12
-
-// dimensions of certain control types
-#define FIXED_TEXT_HEIGHT 8
-#define INPUT_HEIGHT 12
-#define PROGRESS_HEIGHT 12
-#define BUTTON_WIDTH 50
-#define BUTTON_HEIGHT 14
-
-// spacing after the header on each page
-#define SPACING_AFTER_HEADER 6
-// spacing between related controls
-#define SPACING_RELATED 3
-// spacing between unrelated controls
-#define SPACING_UNRELATED 6
-
-// the position of the first control after the header
-#define CONTENT_POS_X ( TAB_PAGE_CONTENT_MARGIN + FIXED_TEXT_HEIGHT + SPACING_AFTER_HEADER )
-
//... fixed texts .......................................................
-
#define FT_HEADER 1
-#define FT_CURRENT_OBJECT_LABEL 6
-#define FT_CURRENT_OBJECT 7
-#define FT_CURRENT_PROGRESS_LABEL 8
-#define FT_CURRENT_PROGRESS 9
-#define FT_ALL_PROGRESS_LABEL 10
-#define FT_OBJECT_COUNT 12
-#define FT_OBJECT_COUNT_PROGRESS 13
-#define FT_MIGRATION_DONE 14
-#define FT_CLOSE_DOC_ERROR 15
-
-//... windows ............................................................
-
-#define WND_CURRENT_PROGRESS 1
-#define WND_ALL_PROGRESS 2
//... strings ............................................................
-
#define STR_STATE_CLOSE_SUB_DOCS 1
#define STR_STATE_BACKUP_DBDOC 2
#define STR_STATE_MIGRATE 3
diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src
index 2f0f364..ae07e00 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -51,117 +51,6 @@ ModalDialog DLG_MACRO_MIGRATION
};
};
-//= ProgressPage
-TabPage TP_MIGRATE
-{
- HelpID = "dbaccess:TabPage:TP_MIGRATE";
- Pos = MAP_APPFONT( 40, 130 );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
-
- Hide = TRUE;
-
- FixedText FT_HEADER
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_CONTENT_MARGIN );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, FIXED_TEXT_HEIGHT );
-
- Text [ en-US ] = "Migration Progress";
- };
-
- FixedText FT_OBJECT_COUNT
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, 2 * FIXED_TEXT_HEIGHT );
-
- Text [ en-US ] = "The database document contains $forms$ form(s) and $reports$ report(s), which are currently being processed:";
-
- WordBreak = TRUE;
- };
-
- FixedText FT_CURRENT_OBJECT_LABEL
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN,
- CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
- Size = MAP_APPFONT( 60, FIXED_TEXT_HEIGHT );
-
- Text [ en-US ] = "Current object:";
- };
-
- FixedText FT_CURRENT_OBJECT
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60,
- CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ), FIXED_TEXT_HEIGHT );
- };
-
- FixedText FT_CURRENT_PROGRESS_LABEL
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN,
- CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
- Size = MAP_APPFONT( 60, FIXED_TEXT_HEIGHT );
-
- Text [ en-US ] = "Current progress:";
- };
-
- FixedText FT_CURRENT_PROGRESS
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60,
- CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ), FIXED_TEXT_HEIGHT );
- };
-
- Window WND_CURRENT_PROGRESS
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60,
- CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ) - TAB_PAGE_CONTENT_MARGIN, PROGRESS_HEIGHT );
-
- Border = TRUE;
- BorderStyle = WINDOW_BORDER_MONO;
- };
-
- FixedText FT_ALL_PROGRESS_LABEL
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN,
- CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED + PROGRESS_HEIGHT + SPACING_UNRELATED );
- Size = MAP_APPFONT( 60, FIXED_TEXT_HEIGHT );
-
- VCenter = TRUE;
-
- Text [ en-US ] = "Overall progress:";
- };
-
- FixedText FT_OBJECT_COUNT_PROGRESS
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60,
- CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED + PROGRESS_HEIGHT + SPACING_UNRELATED );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ) - TAB_PAGE_CONTENT_MARGIN, FIXED_TEXT_HEIGHT );
-
- Text [ en-US ] = "document $current$ of $overall$";
- };
-
- Window WND_ALL_PROGRESS
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60,
- CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED + PROGRESS_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ) - TAB_PAGE_CONTENT_MARGIN, PROGRESS_HEIGHT );
-
- Border = TRUE;
- BorderStyle = WINDOW_BORDER_MONO;
- };
-
- FixedText FT_MIGRATION_DONE
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_HEIGHT - TAB_PAGE_CONTENT_MARGIN - 2 * FIXED_TEXT_HEIGHT );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, 2 * FIXED_TEXT_HEIGHT );
-
- WordBreak = TRUE;
- Hide = TRUE;
-
- Text [ en-US ] = "All forms and reports have been successfully processed. Press 'Next' to show a detailed summary.";
- };
-};
-
String STR_FORM
{
Text [ en-US ] = "Form '$name$'";
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index c1716eb..e989f27 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -178,58 +178,54 @@ namespace dbmm
}
// ProgressPage
- ProgressPage::ProgressPage( MacroMigrationDialog& _rParentDialog )
- :MacroMigrationPage( _rParentDialog, MacroMigrationResId( TP_MIGRATE ) )
- ,m_aObjectCount ( this, MacroMigrationResId( FT_OBJECT_COUNT ) )
- ,m_aCurrentObjectLabel ( this, MacroMigrationResId( FT_CURRENT_OBJECT_LABEL ) )
- ,m_aCurrentObject ( this, MacroMigrationResId( FT_CURRENT_OBJECT ) )
- ,m_aCurrentActionLabel ( this, MacroMigrationResId( FT_CURRENT_PROGRESS_LABEL ) )
- ,m_aCurrentAction ( this, MacroMigrationResId( FT_CURRENT_PROGRESS ) )
- ,m_aCurrentProgress ( this, MacroMigrationResId( WND_CURRENT_PROGRESS ) )
- ,m_aAllProgressLabel ( this, MacroMigrationResId( FT_ALL_PROGRESS_LABEL ) )
- ,m_aAllProgressText ( this, MacroMigrationResId( FT_OBJECT_COUNT_PROGRESS ) )
- ,m_aAllProgress ( this, MacroMigrationResId( WND_ALL_PROGRESS ) )
- ,m_aMigrationDone ( this, MacroMigrationResId( FT_MIGRATION_DONE ) )
+ ProgressPage::ProgressPage(Window* pParent)
+ : MacroMigrationPage(pParent, "MigratePage" ,"dbaccess/ui/migratepage.ui")
{
- FreeResource();
+ get(m_pObjectCount, "count");
+ get(m_pCurrentObject, "object");
+ get(m_pCurrentAction, "current");
+ m_aCurrentProgress.Set(get<ProgressBar>("currentprogress"));
+ get(m_pAllProgressText, "overall");
+ m_aAllProgress.Set(get<ProgressBar>("allprogress"));
+ get(m_pMigrationDone, "done");
}
- TabPage* ProgressPage::Create( ::svt::RoadmapWizard& _rParentDialog )
+ TabPage* ProgressPage::Create(::svt::RoadmapWizard& _rParentDialog)
{
- return new ProgressPage( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) );
+ return new ProgressPage(&_rParentDialog);
}
void ProgressPage::setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports )
{
- OUString sText( m_aObjectCount.GetText() );
+ OUString sText( m_pObjectCount->GetText() );
sText = sText.replaceFirst( "$forms$", OUString::number( _nForms ) );
sText = sText.replaceFirst( "$reports$", OUString::number( _nReports ) );
- m_aObjectCount.SetText( sText );
+ m_pObjectCount->SetText( sText );
}
void ProgressPage::onFinishedSuccessfully()
{
- m_aMigrationDone.Show();
+ m_pMigrationDone->Show();
}
void ProgressPage::startObject( const OUString& _rObjectName, const OUString& _rCurrentAction, const sal_uInt32 _nRange )
{
- m_aCurrentObject.SetText( _rObjectName );
- m_aCurrentAction.SetText( _rCurrentAction );
+ m_pCurrentObject->SetText( _rObjectName );
+ m_pCurrentAction->SetText( _rCurrentAction );
m_aCurrentProgress.SetRange( _nRange );
m_aCurrentProgress.SetValue( (sal_uInt32)0 );
// since this is currently called from the main thread, which does not have the chance
// to re-schedule, we need to explicitly update the display
- m_aCurrentObject.Update();
- m_aCurrentAction.Update();
+ m_pCurrentObject->Update();
+ m_pCurrentAction->Update();
Update();
}
void ProgressPage::setObjectProgressText( const OUString& _rText )
{
- m_aCurrentAction.SetText( _rText );
- m_aCurrentAction.Update();
+ m_pCurrentAction->SetText( _rText );
+ m_pCurrentAction->Update();
Update();
}
@@ -241,9 +237,9 @@ namespace dbmm
void ProgressPage::endObject()
{
- m_aCurrentAction.SetText( OUString() );
+ m_pCurrentAction->SetText( OUString() );
m_aCurrentProgress.SetValue( m_aCurrentProgress.GetRange() );
- m_aCurrentAction.Update();
+ m_pCurrentAction->Update();
Update();
}
@@ -255,7 +251,7 @@ namespace dbmm
void ProgressPage::setOverallProgressText( const OUString& _rText )
{
- m_aAllProgressText.SetText( _rText );
+ m_pAllProgressText->SetText( _rText );
Update();
}
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 2fcbbf1..91f01a9 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -105,7 +105,7 @@ namespace dbmm
class ProgressPage : public MacroMigrationPage, public IMigrationProgress
{
public:
- ProgressPage( MacroMigrationDialog& _rParentDialog );
+ ProgressPage(Window *pParent);
static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
@@ -123,16 +123,13 @@ namespace dbmm
virtual void setOverallProgressValue( const sal_uInt32 _nValue ) SAL_OVERRIDE;
private:
- FixedText m_aObjectCount;
- FixedText m_aCurrentObjectLabel;
- FixedText m_aCurrentObject;
- FixedText m_aCurrentActionLabel;
- FixedText m_aCurrentAction;
+ FixedText* m_pObjectCount;
+ FixedText* m_pCurrentObject;
+ FixedText* m_pCurrentAction;
RangeProgressBar m_aCurrentProgress;
- FixedText m_aAllProgressLabel;
- FixedText m_aAllProgressText;
+ FixedText* m_pAllProgressText;
RangeProgressBar m_aAllProgress;
- FixedText m_aMigrationDone;
+ FixedText* m_pMigrationDone;
};
// ResultPage
diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
index f7d231d..0dde133 100644
--- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
+++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
@@ -28,55 +28,47 @@ namespace dbmm
// RangeProgressBar
/** a slight extension of the usual progress bar, which is able to remember a range
*/
- class RangeProgressBar : public ProgressBar
+ class RangeProgressBar
{
public:
- RangeProgressBar( Window* _pParent, WinBits nWinBits = WB_STDPROGRESSBAR )
- : ProgressBar( _pParent, nWinBits )
+ RangeProgressBar(ProgressBar *pBar = NULL)
+ : m_pBar(pBar)
, m_nRange(0)
- { }
-
- RangeProgressBar( Window* _pParent, const ResId& rResId )
- : ProgressBar( _pParent, rResId )
- , m_nRange(0)
- { }
-
- inline void SetRange( sal_uInt32 _nRange );
- inline sal_uInt32 GetRange() const;
-
- inline void SetValue( sal_uInt32 _nValue );
- inline sal_uInt32 GetValue() const;
+ {
+ }
+
+ void Set(ProgressBar *pBar)
+ {
+ m_pBar = pBar;
+ }
+
+ void SetRange(sal_uInt32 _nRange)
+ {
+ m_nRange = _nRange;
+ if ( !m_nRange )
+ m_nRange = 100;
+ }
+
+ sal_uInt32 GetRange() const
+ {
+ return m_nRange;
+ }
+
+ void SetValue(sal_uInt32 _nValue)
+ {
+ m_pBar->SetValue( (sal_uInt16)( 100.0 * _nValue / m_nRange ) );
+ }
+
+ sal_uInt32 GetValue() const
+ {
+ return (sal_uInt32)(m_pBar->GetValue() / 100.0 * m_nRange);
+ }
private:
+ ProgressBar *m_pBar;
sal_uInt32 m_nRange;
-
- private:
- using ProgressBar::SetValue;
- using ProgressBar::GetValue;
};
- inline void RangeProgressBar::SetRange( sal_uInt32 _nRange )
- {
- m_nRange = _nRange;
- if ( !m_nRange )
- m_nRange = 100;
- }
-
- inline sal_uInt32 RangeProgressBar::GetRange() const
- {
- return m_nRange;
- }
-
- inline void RangeProgressBar::SetValue( sal_uInt32 _nValue )
- {
- ProgressBar::SetValue( (sal_uInt16)( 100.0 * _nValue / m_nRange ) );
- }
-
- inline sal_uInt32 RangeProgressBar::GetValue() const
- {
- return (sal_uInt32)( ProgressBar::GetValue() / 100.0 * m_nRange );
- }
-
} // namespace dbmm
#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_RANGEPROGRESSBAR_HXX
diff --git a/dbaccess/uiconfig/ui/migratepage.ui b/dbaccess/uiconfig/ui/migratepage.ui
new file mode 100644
index 0000000..afa2261
--- /dev/null
+++ b/dbaccess/uiconfig/ui/migratepage.ui
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkGrid" id="MigratePage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="row_spacing">24</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <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">Migration Progress</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </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="count">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">The database document contains $forms$ form(s) and $reports$ report(s), which are currently being processed:</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">64</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="done">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">All forms and reports have been successfully processed. Press 'Next' to show a detailed summary.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">64</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="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Overall progress:</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="overall">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">document $current$ of $overall$</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="GtkProgressBar" id="allprogress">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</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>
+ </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="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Current progress:</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="current">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</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="GtkProgressBar" id="currentprogress">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</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>
+ </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="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Current object:</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="object">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</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>
+ </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>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="overall"/>
+ <widget name="current"/>
+ <widget name="object"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <widgets>
+ <widget name="label4"/>
+ <widget name="label6"/>
+ <widget name="label5"/>
+ </widgets>
+ </object>
+</interface>
commit fa9ce74db51a27a2ecb65fc6045c5fc209581a57
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 22 09:09:19 2014 +0100
convert summary page to .ui
Change-Id: I27fbeaafb53b4a0ae30c3408888419af93a37300
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 25675c8..08da251 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/specialsettingspage \
dbaccess/uiconfig/ui/sortdialog \
dbaccess/uiconfig/ui/sqlexception \
+ dbaccess/uiconfig/ui/summarypage \
dbaccess/uiconfig/ui/tablesfilterdialog \
dbaccess/uiconfig/ui/tablesfilterpage \
dbaccess/uiconfig/ui/tablesjoindialog \
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index fb6fb05..fec924b 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -39,7 +39,6 @@
//= tab pages
#define TP_MIGRATE ( RID_DBMM_TAPPAGE_START + 2 )
-#define TP_SUMMARY ( RID_DBMM_TAPPAGE_START + 3 )
//= strings
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc
index fdb85a0..334ef62 100644
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ b/dbaccess/source/ext/macromigration/macromigration.hrc
@@ -52,7 +52,6 @@
#define FT_CURRENT_PROGRESS_LABEL 8
#define FT_CURRENT_PROGRESS 9
#define FT_ALL_PROGRESS_LABEL 10
-#define FT_CHANGES_LABEL 11
#define FT_OBJECT_COUNT 12
#define FT_OBJECT_COUNT_PROGRESS 13
#define FT_MIGRATION_DONE 14
@@ -63,18 +62,12 @@
#define WND_CURRENT_PROGRESS 1
#define WND_ALL_PROGRESS 2
-//... edits ..............................................................
-
-#define ED_CHANGES 2
-
//... strings ............................................................
#define STR_STATE_CLOSE_SUB_DOCS 1
#define STR_STATE_BACKUP_DBDOC 2
#define STR_STATE_MIGRATE 3
#define STR_STATE_SUMMARY 4
-#define STR_SUCCESSFUL 5
-#define STR_UNSUCCESSFUL 6
#endif // DBACCESS_MACROMIGRATION_HRC
diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src
index cf0c6c1..2f0f364 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -162,56 +162,6 @@ TabPage TP_MIGRATE
};
};
-//= ResultPage
-
-TabPage TP_SUMMARY
-{
- HelpID = "dbaccess:TabPage:TP_SUMMARY";
- Pos = MAP_APPFONT( 40, 130 );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
-
- Hide = TRUE;
-
- FixedText FT_HEADER
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_CONTENT_MARGIN );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, FIXED_TEXT_HEIGHT );
-
- Text [ en-US ] = "Summary";
- };
-
- FixedText FT_CHANGES_LABEL
- {
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, FIXED_TEXT_HEIGHT );
-
- WordBreak = TRUE;
- };
-
- MultiLineEdit ED_CHANGES
- {
- HelpID = "dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES";
- Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X + FIXED_TEXT_HEIGHT + SPACING_RELATED );
- Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
- TAB_PAGE_HEIGHT - ( CONTENT_POS_X + FIXED_TEXT_HEIGHT + SPACING_RELATED ) - TAB_PAGE_CONTENT_MARGIN );
-
- ReadOnly = TRUE;
- AutoVScroll = TRUE;
- Border = TRUE;
- BorderStyle = WINDOW_BORDER_MONO;
- };
-
- String STR_SUCCESSFUL
- {
- Text [ en-US ] = "The migration was successful. Below is a log of the actions which have been taken to your document.";
- };
-
- String STR_UNSUCCESSFUL
- {
- Text [ en-US ] = "The migration was not successful. Examine the migration log below for details.";
- };
-};
-
String STR_FORM
{
Text [ en-US ] = "Form '$name$'";
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index ceddbe9..c1716eb 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -266,45 +266,28 @@ namespace dbmm
}
// ResultPage
- ResultPage::ResultPage( MacroMigrationDialog& _rParentDialog )
- :MacroMigrationPage( _rParentDialog, MacroMigrationResId( TP_SUMMARY ) )
- ,m_aChangesLabel( this, MacroMigrationResId( FT_CHANGES_LABEL ) )
- ,m_aChanges ( this, MacroMigrationResId( ED_CHANGES ) )
- ,m_aSuccessful ( MacroMigrationResId( STR_SUCCESSFUL ) )
- ,m_aUnsuccessful( MacroMigrationResId( STR_UNSUCCESSFUL ) )
+ ResultPage::ResultPage(Window* pParent)
+ : MacroMigrationPage(pParent, "SummaryPage" ,"dbaccess/ui/summarypage.ui")
{
- FreeResource();
+ get(m_pChanges, "textview");
+ m_pChanges->set_height_request(GetTextHeight() * 10);
+ m_pChanges->set_width_request(approximate_char_width() * 40);
+ get(m_pSuccessLabel, "success");
+ get(m_pFailureLabel, "failure");
}
- TabPage* ResultPage::Create( ::svt::RoadmapWizard& _rParentDialog )
+ TabPage* ResultPage::Create(::svt::RoadmapWizard& _rParentDialog)
{
- return new ResultPage( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) );
+ return new ResultPage(&_rParentDialog);
}
- void ResultPage::displayMigrationLog( const bool _bSuccessful, const OUString& _rSummary )
+ void ResultPage::displayMigrationLog(const bool _bSuccessful, const OUString& _rSummary)
{
- m_aChangesLabel.SetText( _bSuccessful ? m_aSuccessful : m_aUnsuccessful );
- m_aChanges.SetText( _rSummary );
-
- // resize m_aChangesLabel and m_aChances as needed for the label text to fit
- Rectangle aOriginalLabelSize( m_aChangesLabel.GetPosPixel(), m_aChangesLabel.GetSizePixel() );
- // assume 3 lines, at most
- Rectangle aNewLabelSize( aOriginalLabelSize );
- aNewLabelSize.Bottom() = aNewLabelSize.Top() + m_aChangesLabel.LogicToPixel( Size( 0, 3*8 ), MAP_APPFONT ).Height();
- TextRectInfo aInfo;
- aNewLabelSize = m_aChangesLabel.GetTextRect( aNewLabelSize, m_aChangesLabel.GetText(), TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK, &aInfo );
- aNewLabelSize.Bottom() = aNewLabelSize.Top() + m_aChangesLabel.LogicToPixel( Size( 0, aInfo.GetLineCount() * 8 ), MAP_APPFONT ).Height();
-
- m_aChangesLabel.SetSizePixel( aNewLabelSize.GetSize() );
-
- long nChangesDiff = aNewLabelSize.GetHeight() - aOriginalLabelSize.GetHeight();
- Size aChangesSize( m_aChanges.GetSizePixel() );
- aChangesSize.Height() -= nChangesDiff;
- m_aChanges.SetSizePixel( aChangesSize );
-
- Point aChangesPos( m_aChanges.GetPosPixel() );
- aChangesPos.Y() += nChangesDiff;
- m_aChanges.SetPosPixel( aChangesPos );
+ if (_bSuccessful)
+ m_pFailureLabel->Hide();
+ else
+ m_pSuccessLabel->Hide();
+ m_pChanges->SetText(_rSummary);
}
} // namespace dbmm
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 50b6a5a..2fcbbf1 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -139,17 +139,16 @@ namespace dbmm
class ResultPage : public MacroMigrationPage
{
public:
- ResultPage( MacroMigrationDialog& _rParentDialog );
+ ResultPage(Window *pParent);
static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
void displayMigrationLog( const bool _bSuccessful, const OUString& _rLog );
private:
- FixedText m_aChangesLabel;
- MultiLineEdit m_aChanges;
- OUString m_aSuccessful;
- OUString m_aUnsuccessful;
+ FixedText* m_pSuccessLabel;
+ FixedText* m_pFailureLabel;
+ VclMultiLineEdit* m_pChanges;
};
} // namespace dbmm
diff --git a/dbaccess/uiconfig/ui/summarypage.ui b/dbaccess/uiconfig/ui/summarypage.ui
new file mode 100644
index 0000000..024a06e
--- /dev/null
+++ b/dbaccess/uiconfig/ui/summarypage.ui
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkGrid" id="SummaryPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="row_spacing">24</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <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">Summary</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </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="success">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">The migration was successful. Below is a log of the actions which have been taken to your document.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">64</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="failure">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">The migration was not successful. Examine the migration log below for details.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">64</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="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="textview:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="editable">False</property>
+ </object>
+ </child>
+ </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>
+ </object>
+</interface>
commit c1dd91a93c59b19ed9542da61e5b1ce43cf4ffbf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 22 08:49:44 2014 +0100
callcatcher: update unused code
Change-Id: I1dd1b40d807c7c9d9b145aca9f69a67d786ec5ff
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 5f6de8c..4123ac6 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -764,11 +764,6 @@ OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString
return lcl_ConvertRole( rRoleString, true );
}
-OUString DialogModel::ConvertRoleFromUIToInternal( const OUString & rRoleString )
-{
- return lcl_ConvertRole( rRoleString, false );
-}
-
OUString DialogModel::GetRoleDataLabel()
{
return ::chart::SchResId(STR_OBJECT_DATALABELS).toString();
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index 7e5e830..99a92b8 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -158,7 +158,6 @@ public:
void startControllerLockTimer();
static OUString ConvertRoleFromInternalToUI( const OUString & rRoleString );
- static OUString ConvertRoleFromUIToInternal( const OUString& rRoleString );
static OUString GetRoleDataLabel();
// pass a role string (not translated) and get an index that serves for
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 6efb35a..09f487b 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -207,24 +207,6 @@ namespace dbp
}
}
-
- void OControlWizardPage::adjustControlForNoDSDisplay(Control* _pControl, bool _bConstLowerDistance)
- {
- ::Size aDistanceToMove = LogicToPixel( ::Size( 0, 37 ), MAP_APPFONT );
-
- ::Point aPos = _pControl->GetPosPixel();
- aPos.Y() -= aDistanceToMove.Height();
- _pControl->SetPosPixel(aPos);
-
- if (_bConstLowerDistance)
- {
- ::Size aSize = _pControl->GetSizePixel();
- aSize.Height() += aDistanceToMove.Height();
- _pControl->SetSizePixel(aSize);
- }
- }
-
-
void OControlWizardPage::initializePage()
{
if (m_pFormDatasource && m_pFormContentTypeLabel && m_pFormTable)
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 52efe99..725c0b3 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -90,7 +90,6 @@ namespace dbp
protected:
void enableFormDatasourceDisplay();
- void adjustControlForNoDSDisplay(Control* _pControl, bool bConstLowerDistance = false);
protected:
// OWizardPage overridables
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 5f6be1f..00e638c 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -679,14 +679,6 @@ IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG )
return 0;
}
-
-
-IMPL_STATIC_LINK_NOINSTANCE( SvtFileDialog, ViewHdl_Impl, ImageButton*, EMPTYARG )
-{
- return 0;
-}
-
-
bool SvtFileDialog::createNewUserFilter( const OUString& _rNewFilter, bool _bAllowUserDefExt )
{
// delete the old user filter and create a new one
@@ -2026,7 +2018,6 @@ short SvtFileDialog::PrepareExecute()
// Somebody might want to enable some controls according to the current filter
FilterSelect();
- ViewHdl_Impl( this, NULL );
OpenURL_Impl( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
_pFileView->Show();
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 4a217c0..e4fad34 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -116,7 +116,6 @@ private:
DECL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, ListBox* );
DECL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton* );
- DECL_STATIC_LINK( SvtFileDialog, ViewHdl_Impl, ImageButton* );
DECL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void* );
DECL_LINK ( CancelHdl_Impl, void* );
DECL_STATIC_LINK( SvtFileDialog, FileNameGetFocusHdl_Impl, void* );
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index ea2390d..35d9357 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -69,7 +69,6 @@ public:
{ return aNameResId.GetResMgr(); }
const SfxInterface* GetGenoType() const { return pGenoType; }
- const SfxInterface* GetRealInterfaceForSlot( const SfxSlot* ) const;
void RegisterObjectBar( sal_uInt16, const ResId&, const OUString* pST=0 );
void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const OUString* pST=0 );
diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx
index 33442d8..38c3099 100644
--- a/include/svtools/urlcontrol.hxx
+++ b/include/svtools/urlcontrol.hxx
@@ -37,7 +37,6 @@ namespace svt
OUString m_sPreservedText;
public:
- OFileURLControl(Window* _pParent, const ResId& _rId);
OFileURLControl(Window* _pParent, WinBits nStyle);
protected:
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index f58f509..b7c350b 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -48,7 +48,6 @@ namespace drawinglayer
protected:
public:
- SdrAllFillAttributesHelper();
SdrAllFillAttributesHelper(const Color& rColor);
SdrAllFillAttributesHelper(const SfxItemSet& rSet);
~SdrAllFillAttributesHelper();
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 834b8b3..20fb804 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -50,9 +50,6 @@ typedef short RSWND_STYLE;
#define WORKWIN_SHOWMINIMIZED 1
#define WORKWIN_SHOWMAXIMIZED 2
-// For "FixedBitmap" resource:
-#define RSC_FIXEDBITMAP_BITMAP 0x0001
-
// For "FixedImage" resource:
#define RSC_FIXEDIMAGE_IMAGE 0x0001
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index 8e56341..7b2d811 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -249,9 +249,6 @@ public:
static void runtimeexception( const OUString& DetailedMessage, const css::uno::Exception& ex, int err, const OUString& /*additionalArgument*/ ) throw( css::uno::RuntimeException );
static void runtimeexception( int err, const OUString& additionalArgument ) throw( css::uno::RuntimeException );
-
- static void runtimeexception( const css::uno::Exception& ex ) throw( css::uno::RuntimeException );
-
};
} // vba
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 33a6632..e215e99 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -138,9 +138,6 @@ private:
SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
const Point& rPos, const Size& rSize );
-protected:
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
-
public:
explicit FixedBitmap( Window* pParent, WinBits nStyle = 0 );
virtual ~FixedBitmap();
diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx
index a990b8e..312a6a3 100644
--- a/include/vcl/tabdlg.hxx
+++ b/include/vcl/tabdlg.hxx
@@ -45,8 +45,6 @@ public:
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
- void AdjustLayout();
-
void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; }
Window* GetViewWindow() const { return mpViewWindow; }
void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; }
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index ed066b2..5afa835 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -420,7 +420,6 @@ public:
* Takes ownership of the window
*/
void AddChildWindow(Window* pChildWindow);
- void DeleteChildWindow(Window* pChildWindow);
protected:
// #114409#
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index bed697b..8a3f271 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -477,17 +477,4 @@ void ScGridWindow::AddChildWindow(Window* pWindow)
maChildWindows.push_back(pWindow);
}
-void ScGridWindow::DeleteChildWindow(Window* pWindow)
-{
- for(boost::ptr_vector<Window>::iterator itr = maChildWindows.begin(),
- itrEnd = maChildWindows.end(); itr != itrEnd; ++itr)
- {
- if(&(*itr) == pWindow)
- {
- maChildWindows.erase(itr);
- return;
- }
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index fe52483..32c7e8e 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -619,28 +619,4 @@ bool SfxInterface::IsObjectBarVisible(sal_uInt16 nNo) const
return pImpData->aObjectBars[nNo]->bVisible;
}
-const SfxInterface* SfxInterface::GetRealInterfaceForSlot( const SfxSlot *pRealSlot ) const
-{
- SAL_WARN_IF( !pImpData->bRegistered, "sfx.control", "Interface not registered" );
-
- const SfxInterface* pInterface = this;
-
- // The slot could also originate from the interface of a shell base class.
- do
- {
- const SfxSlot *pLastSlot = (*pInterface)[pInterface->Count()-1];
- const SfxSlot *pFirstSlot = (*pInterface)[0];
-
- // Is pInterface the Owner of pRealSlot ?
- if ( pFirstSlot <= pRealSlot && pRealSlot <= pLastSlot )
- break;
-
- // Otherwise try the Interface of Super class
- pInterface = pInterface->pGenoType;
- }
- while ( pInterface );
-
- return pInterface;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index ddb4025..771bd14 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -25,18 +25,7 @@
namespace svt
{
-
-
-
//= OFileURLControl
-
-
- OFileURLControl::OFileURLControl(Window* _pParent, const ResId& _rId)
- : SvtURLBox(_pParent, _rId, INET_PROT_FILE)
- {
- DisableHistory();
- }
-
OFileURLControl::OFileURLControl(Window* _pParent, WinBits nStyle)
: SvtURLBox(_pParent, nStyle, INET_PROT_FILE)
{
@@ -52,7 +41,6 @@ namespace svt
return pListBox;
}
-
bool OFileURLControl::PreNotify( NotifyEvent& _rNEvt )
{
if (GetSubEdit() == _rNEvt.GetWindow())
@@ -64,7 +52,6 @@ namespace svt
return SvtURLBox::PreNotify(_rNEvt);
}
-
bool OFileURLControl::Notify( NotifyEvent& _rNEvt )
{
if (GetSubEdit() == _rNEvt.GetWindow())
@@ -87,9 +74,6 @@ namespace svt
return SvtURLBox::Notify(_rNEvt);
}
-
-
} // namespace svt
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
index 31291b9..58965e4 100644
--- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
+++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
@@ -54,15 +54,6 @@ namespace drawinglayer
}
}
- SdrAllFillAttributesHelper::SdrAllFillAttributesHelper()
- : maLastPaintRange(),
- maLastDefineRange(),
- maFillAttribute(),
- maFillGradientAttribute(),
- maPrimitives()
- {
- }
-
SdrAllFillAttributesHelper::SdrAllFillAttributesHelper(const Color& rColor)
: maLastPaintRange(),
maLastDefineRange(),
diff --git a/unusedcode.easy b/unusedcode.easy
index 15dd8ac..e26494b06 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,52 +1,42 @@
(anonymous namespace)::flagToString(unsigned short)
BigInt::BigInt(unsigned int)
CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&)
-ChartTest::getChartDocFromDrawImpress(int, int)
-DocumentHandler::DocumentHandler(com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler>&)
-EditEngine::IsIdleFormatterActive() const
GDriveDocument::GDriveDocument(GDriveSession*)
GDriveFolder::GDriveFolder(GDriveSession*)
GDriveProperty::GDriveProperty()
GDriveSession::GDriveSession()
-Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, Json, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, Json> > > const&)
-Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::shared_ptr<libcmis::Property>, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, boost::shared_ptr<libcmis::Property> > > > const&)
+Json::Json(std::__debug::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, Json, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, Json> > > const&)
+Json::Json(std::__debug::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::shared_ptr<libcmis::Property>, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, boost::shared_ptr<libcmis::Property> > > > const&)
Json::swap(Json&)
-MenuBar::AddMenuBarButton(Image const&, Link const&, rtl::OUString const&, unsigned short)
-MenuBar::GetMenuBarButtonRectPixel(unsigned short)
-MenuBar::RemoveMenuBarButton(unsigned short)
-MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link const&)
MetaAction::TypeName(unsigned short)
MetafileXmlDump::filterNoneActionTypes()
OpenGLContext::renderToFile()
OpenGLRender::CreateTextTexture(rtl::OUString const&, Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long)
-OpenGLRender::GetAsBitmap()
OutputDevice::GetCanvas() const
OutputDevice::HasAlpha()
+OutputDevice::LogicHeightToDeviceCoordinate(long) const
OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&)
OutputDevice::LogicToPixel(Region const&, MapMode const&) const
OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const
OutputDevice::PixelToLogic(Region const&, MapMode const&) const
-RenderPrimitive::bindSortedIndicesBuf()
-RenderPrimitive::copyIndiceBufferData(char const*, unsigned int)
-RenderPrimitive::copyVertexBufferData(char const*, unsigned int)
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
+ScDBFuncUndo::SetDrawUndoAction(SdrUndoAction*)
ScDocument::AreaBroadcastInRange(ScRange const&, ScHint const&)
ScDocument::CreateFormatTable() const
+ScDocument::MarkSubTotalCells(sc::ColumnSpanSet&, ScRange const&, bool) const
ScFormulaCellGroup::scheduleCompilation()
ScRawToken::Clone() const
ScRawToken::Delete()
ScTabView::DrawMarkRect(Rectangle const&)
ScTabViewShell::SetChartArea(tools::SvRef<ScRangeList> const&, Rectangle const&)
+ScTable::AttachFormulaCells(sc::StartListeningContext&, short, int, short, int)
+ScTable::DetachFormulaCells(sc::EndListeningContext&, short, int, short, int)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
-SdrItemBrowser::ForceParent()
-SdrItemBrowser::SdrItemBrowser(SdrView&)
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxInt64Item::SetValue(long)
-StyleSettings::SetActiveColor2(Color const&)
StyleSettings::SetCursorSize(long)
-StyleSettings::SetDeactiveColor2(Color const&)
StyleSettings::SetFloatTitleHeight(long)
StyleSettings::SetHideDisabledMenuItems(bool)
StyleSettings::SetSpinSize(long)
@@ -56,11 +46,13 @@ StyleSettings::SetUseFlatMenus(bool)
SvpSalInstance::PostedEventsInQueue()
SvtListener::IsListening(SvtBroadcaster&) const
SvxFontListBox::GetSelectEntry() const
-SvxNumberFormatShell::IsAdded_Impl(unsigned long)
SvxOpenGLObject::getRenderer()
SvxOpenGLObject::setRenderer(IOpenGLRenderer*)
-TextDoc::IsValidPaM(TextPaM const&)
-Texture::setSamplerParameter(unsigned int, unsigned int)
+SwLayHelper::CheckPageFlyCache(SwPageFrm*&, SwFlyFrm*)
+SwUpdateAttr::SwUpdateAttr(int, int, unsigned short, std::__debug::vector<unsigned short, std::allocator<unsigned short> >)
+Test::testCopyPasteSkipEmptyConditionalFormatting()
+Test::testPerf()
+Test::testSharedFormulaMoveBlock()
UnoApiTest::closeDocument(com::sun::star::uno::Reference<com::sun::star::lang::XComponent>)
VCLXGraphics::getFillColor()
VCLXGraphics::getFont()
@@ -69,7 +61,6 @@ VCLXGraphics::getRasterOp()
VCLXGraphics::getTextColor()
VCLXGraphics::getTextFillColor()
XmlTestTools::parseXml(utl::TempFile&)
-XmlWriter::element(rtl::OString const&)
apitest::CellProperties::testRotateReference()
apitest::CellProperties::testVertJustify()
apitest::DataPilotField::testAutoShowInfo()
@@ -155,6 +146,7 @@ apitest::XSheetAnnotation::testGetIsVisible()
apitest::XSheetAnnotation::testGetPosition()
apitest::XSheetAnnotation::testSetIsVisible()
apitest::XSheetAnnotations::testCount()
+apitest::XSheetAnnotations::testGetByIndex()
apitest::XSheetAnnotations::testInsertNew()
apitest::XSheetAnnotations::testRemoveByIndex()
apitest::XSheetOutline::testAutoOutline()
@@ -181,18 +173,24 @@ apitest::XTextContent::testAttach()
apitest::XTextContent::testGetAnchor()
apitest::XTextField::testGetPresentation()
basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon const&)
+calc::OCellListSource::checkConsistency_static(void const*)
+calc::OCellValueBinding::checkConsistency_static(void const*)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
+chart::InternalData::clearDefaultData()
chart::ShapeToolbarController::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
+chart::opengl3D::Bar::Bar(chart::opengl3D::OpenGL3DRenderer*, glm::detail::tmat4x4<float> const&, unsigned int, unsigned int)
+comphelper::OAccessibleImplementationAccess::setStateBit(short, bool)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
-connectivity::OSQLParseNode::showParseTree(rtl::OUString&) const
connectivity::firebird::release(int&, cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&, com::sun::star::lang::XComponent*)
connectivity::sdbcx::OGroup::OGroup(bool)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool)
+formula::FormulaTokenArray::GetNextOpCodeRPN(OpCodeEnum)
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
+oox::drawingml::TextListStyle::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
sc::CLBuildKernelThread::CLBuildKernelThread()
sc::CLBuildKernelThread::consume()
@@ -202,10 +200,16 @@ sc::CellValues::transferTo(ScColumn&, int)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::framework::FrameworkHelper::Instance(com::sun::star::uno::Reference<com::sun::star::frame::XController> const&)
+sd::slidesorter::view::PageObjectPainter::InvalidateBitmaps()
sfx2::SvBaseLink::SvBaseLink(rtl::OUString const&, unsigned short, sfx2::SvLinkSource*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
+std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
-std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
+svl::GridPrinter::clear()
+svl::GridPrinter::resize(unsigned long, unsigned long)
+svt::CheckInvariants(void const*)
+svt::table::TableControl_Impl::impl_checkInvariants() const
+svt::table::UnoControlTableModel::checkInvariants() const
utl::extractTime(com::sun::star::util::DateTime const&, com::sun::star::util::Time&)
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index cdee33b..7bbe9e5 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -1085,12 +1085,6 @@ void DebugHelper::runtimeexception( int err, const OUString& additionalArgument
runtimeexception( OUString(), css::uno::Exception(), err, additionalArgument );
}
-void DebugHelper::runtimeexception( const css::uno::Exception& ex ) throw( css::uno::RuntimeException )
-{
- runtimeexception( OUString(), ex, SbERR_INTERNAL_ERROR, OUString() );
-}
-
-
Millimeter::Millimeter():m_nMillimeter(0) {}
Millimeter::Millimeter(double mm):m_nMillimeter(mm) {}
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 3b50a3c..35f6dab 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -742,19 +742,6 @@ void FixedBitmap::ImplInitSettings()
}
}
-void FixedBitmap::ImplLoadRes( const ResId& rResId )
-{
- Control::ImplLoadRes( rResId );
-
- sal_uLong nObjMask = ReadLongRes();
-
- if ( RSC_FIXEDBITMAP_BITMAP & nObjMask )
- {
- maBitmap = Bitmap( ResId( (RSHEADER_TYPE*)GetClassRes(), *rResId.GetResMgr() ) );
- IncrementRes( GetObjSizeRes( (RSHEADER_TYPE*)GetClassRes() ) );
- }
-}
-
FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) :
Control( WINDOW_FIXEDBITMAP )
{
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 7ce6136..cbd60dc 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -235,12 +235,4 @@ void TabDialog::StateChanged( StateChangedType nType )
Dialog::StateChanged( nType );
}
-void TabDialog::AdjustLayout()
-{
- SAL_WARN_IF(isLayoutEnabled(), "vcl.layout", "unnecessary to call TabDialog::AdjustLayout when layout enabled");
-
- ImplPosControls();
- queue_resize();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list