[Libreoffice-commits] core.git: filter/AllLangResTarget_flash.mk filter/Module_filter.mk filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk
Laurent Balland-Poirier
laurent.balland-poirier at laposte.net
Wed Nov 13 06:02:04 PST 2013
filter/AllLangResTarget_flash.mk | 31 ---
filter/Module_filter.mk | 1
filter/UIConfig_xsltdlg.mk | 1
filter/source/flash/impswfdialog.cxx | 82 +++------
filter/source/flash/impswfdialog.hrc | 42 -----
filter/source/flash/impswfdialog.hxx | 30 +--
filter/source/flash/impswfdialog.src | 167 --------------------
filter/source/flash/swfdialog.cxx | 2
filter/uiconfig/ui/impswfdialog.ui | 292 +++++++++++++++++++++++++++++++++++
9 files changed, 336 insertions(+), 312 deletions(-)
New commits:
commit 191dc43f97ed8bec78ee540676a91815cad71104
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date: Tue Nov 5 19:39:26 2013 +0100
Convert ImpSWFDialog.src to ui
add ui file
Change-Id: I42af9b8969a07b4d738c1fd30fc8917f24f784c6
Reviewed-on: https://gerrit.libreoffice.org/6592
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/filter/AllLangResTarget_flash.mk b/filter/AllLangResTarget_flash.mk
deleted file mode 100644
index 841d626..0000000
--- a/filter/AllLangResTarget_flash.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,flash))
-
-$(eval $(call gb_AllLangResTarget_add_srs,flash,\
- filter/flash \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,filter/flash))
-
-$(eval $(call gb_SrsTarget_add_files,filter/flash,\
- filter/source/flash/impswfdialog.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 559fb65..a2d09f3 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Module_Module,filter))
$(eval $(call gb_Module_add_targets,filter,\
AllLangResTarget_eps \
- AllLangResTarget_flash \
AllLangResTarget_pdffilter \
AllLangResTarget_t602filter \
AllLangResTarget_xsltdlg \
diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk
index 6b7b48f..abef4d3 100644
--- a/filter/UIConfig_xsltdlg.mk
+++ b/filter/UIConfig_xsltdlg.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,filter))
$(eval $(call gb_UIConfig_add_uifiles,filter,\
+ filter/uiconfig/ui/impswfdialog \
filter/uiconfig/ui/pdfgeneralpage \
filter/uiconfig/ui/pdflinkspage \
filter/uiconfig/ui/pdfoptionsdialog \
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx
index 5a4ab63..0bb6239 100644
--- a/filter/source/flash/impswfdialog.cxx
+++ b/filter/source/flash/impswfdialog.cxx
@@ -19,7 +19,6 @@
#include "impswfdialog.hxx"
-#include "impswfdialog.hrc"
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
@@ -29,48 +28,36 @@ using namespace com::sun::star::beans;
// - ImpPDFDialog -
// ----------------
-ImpSWFDialog::ImpSWFDialog( Window* pParent, ResMgr& rResMgr, Sequence< PropertyValue >& rFilterData ) :
- ModalDialog( pParent, ResId( DLG_OPTIONS, rResMgr ) ),
- maFiDescr( this, ResId( FI_DESCR, rResMgr ) ),
- maNumFldQuality( this, ResId( NUM_FLD_QUALITY, rResMgr ) ),
- maFiExportAllDescr( this, ResId( FI_EXPORT_ALL_DESCR, rResMgr ) ),
- maCheckExportAll( this, ResId( BOOL_EXPORT_ALL, rResMgr ) ),
- maFiExportBackgroundsDescr( this, ResId( FI_EXPORT_BACKGROUNDS_DESCR, rResMgr ) ),
- maCheckExportBackgrounds( this, ResId( BOOL_EXPORT_BACKGROUNDS, rResMgr ) ),
- maFiExportBackgroundObjectsDescr( this, ResId( FI_EXPORT_BACKGROUND_OBJECTS_DESCR, rResMgr ) ),
- maCheckExportBackgroundObjects( this, ResId( BOOL_EXPORT_BACKGROUND_OBJECTS, rResMgr ) ),
- maFiExportSlideContentsDescr( this, ResId( FI_EXPORT_SLIDE_CONTENTS_DESCR, rResMgr ) ),
- maCheckExportSlideContents( this, ResId( BOOL_EXPORT_SLIDE_CONTENTS, rResMgr ) ),
- maFiExportSoundDescr( this, ResId( FI_EXPORT_SOUND_DESCR, rResMgr ) ),
- maCheckExportSound( this, ResId( BOOL_EXPORT_SOUND, rResMgr ) ),
- maFiExportOLEAsJPEGDescr( this, ResId( FI_EXPORT_OLE_AS_JPEG_DESCR, rResMgr ) ),
- maCheckExportOLEAsJPEG( this, ResId( BOOL_EXPORT_OLE_AS_JPEG, rResMgr ) ),
- maFiExportMultipleFilesDescr( this, ResId( FI_EXPORT_MULTIPLE_FILES_DESCR, rResMgr ) ),
- maCheckExportMultipleFiles( this, ResId( BOOL_EXPORT_MULTIPLE_FILES, rResMgr ) ),
-
- maBtnOK( this, ResId( BTN_OK, rResMgr ) ),
- maBtnCancel( this, ResId( BTN_CANCEL, rResMgr ) ),
- maBtnHelp( this, ResId( BTN_HELP, rResMgr ) ),
+ImpSWFDialog::ImpSWFDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) :
+ ModalDialog( pParent, "ImpSWFDialog", "filter/ui/impswfdialog.ui" ),
+
maConfigItem( "Office.Common/Filter/Flash/Export/", &rFilterData )
{
+ get(mpNumFldQuality,"quality");
+ get(mpCheckExportAll,"exportall");
+ get(mpCheckExportMultipleFiles,"exportmultiplefiles");
+ get(mpCheckExportBackgrounds,"exportbackgrounds");
+ get(mpCheckExportBackgroundObjects,"exportbackgroundobjects");
+ get(mpCheckExportSlideContents,"exportslidecontents");
+ get(mpCheckExportSound,"exportsound");
+ get(mpCheckExportOLEAsJPEG,"exportoleasjpeg");
+
const sal_uLong nCompressMode = maConfigItem.ReadInt32( "CompressMode", 75 );
- maNumFldQuality.SetValue( nCompressMode );
+ mpNumFldQuality->SetValue( nCompressMode );
- maCheckExportAll.Check();
- maCheckExportSlideContents.Check();
- maCheckExportSound.Check();
+ mpCheckExportAll->Check();
+ mpCheckExportSlideContents->Check();
+ mpCheckExportSound->Check();
- maCheckExportAll.SetToggleHdl( LINK( this, ImpSWFDialog, OnToggleCheckbox ) );
+ mpCheckExportAll->SetToggleHdl( LINK( this, ImpSWFDialog, OnToggleCheckbox ) );
- maCheckExportBackgrounds.Disable(); maFiExportBackgroundsDescr.Disable();
- maCheckExportBackgroundObjects.Disable(); maFiExportBackgroundObjectsDescr.Disable();
- maCheckExportSlideContents.Disable(); maFiExportSlideContentsDescr.Disable();
+ mpCheckExportBackgrounds->Disable();
+ mpCheckExportBackgroundObjects->Disable();
+ mpCheckExportSlideContents->Disable();
#ifdef AUGUSTUS
- maCheckExportMultipleFiles.Check();
+ mpCheckExportMultipleFiles->Check();
#endif
-
- FreeResource();
}
// -----------------------------------------------------------------------------
@@ -83,15 +70,15 @@ ImpSWFDialog::~ImpSWFDialog()
Sequence< PropertyValue > ImpSWFDialog::GetFilterData()
{
- sal_Int32 nCompressMode = (sal_Int32)maNumFldQuality.GetValue();
+ sal_Int32 nCompressMode = (sal_Int32)mpNumFldQuality->GetValue();
maConfigItem.WriteInt32( "CompressMode" , nCompressMode );
- maConfigItem.WriteBool( "ExportAll", maCheckExportAll.IsChecked() );
- maConfigItem.WriteBool( "ExportBackgrounds", maCheckExportBackgrounds.IsChecked() );
- maConfigItem.WriteBool( "ExportBackgroundObjects", maCheckExportBackgroundObjects.IsChecked() );
- maConfigItem.WriteBool( "ExportSlideContents", maCheckExportSlideContents.IsChecked() );
- maConfigItem.WriteBool( "ExportSound", maCheckExportSound.IsChecked() );
- maConfigItem.WriteBool( "ExportOLEAsJPEG", maCheckExportOLEAsJPEG.IsChecked() );
- maConfigItem.WriteBool( "ExportMultipleFiles", maCheckExportMultipleFiles.IsChecked() );
+ maConfigItem.WriteBool( "ExportAll", mpCheckExportAll->IsChecked() );
+ maConfigItem.WriteBool( "ExportBackgrounds", mpCheckExportBackgrounds->IsChecked() );
+ maConfigItem.WriteBool( "ExportBackgroundObjects", mpCheckExportBackgroundObjects->IsChecked() );
+ maConfigItem.WriteBool( "ExportSlideContents", mpCheckExportSlideContents->IsChecked() );
+ maConfigItem.WriteBool( "ExportSound", mpCheckExportSound->IsChecked() );
+ maConfigItem.WriteBool( "ExportOLEAsJPEG", mpCheckExportOLEAsJPEG->IsChecked() );
+ maConfigItem.WriteBool( "ExportMultipleFiles", mpCheckExportMultipleFiles->IsChecked() );
Sequence< PropertyValue > aRet( maConfigItem.GetFilterData() );
@@ -101,14 +88,11 @@ Sequence< PropertyValue > ImpSWFDialog::GetFilterData()
// AS: This is called whenever the user toggles one of the checkboxes
IMPL_LINK( ImpSWFDialog, OnToggleCheckbox, CheckBox*, pBox )
{
- if (pBox == &maCheckExportAll)
+ if (pBox == mpCheckExportAll)
{
- maCheckExportBackgrounds.Enable(!maCheckExportBackgrounds.IsEnabled());
- maFiExportBackgroundsDescr.Enable(!maFiExportBackgroundsDescr.IsEnabled());
- maCheckExportBackgroundObjects.Enable(!maCheckExportBackgroundObjects.IsEnabled());
- maFiExportBackgroundObjectsDescr.Enable(!maFiExportBackgroundObjectsDescr.IsEnabled());
- maCheckExportSlideContents.Enable(!maCheckExportSlideContents.IsEnabled());
- maFiExportSlideContentsDescr.Enable(!maFiExportSlideContentsDescr.IsEnabled());
+ mpCheckExportBackgrounds->Enable(!mpCheckExportBackgrounds->IsEnabled());
+ mpCheckExportBackgroundObjects->Enable(!mpCheckExportBackgroundObjects->IsEnabled());
+ mpCheckExportSlideContents->Enable(!mpCheckExportSlideContents->IsEnabled());
}
return 0;
diff --git a/filter/source/flash/impswfdialog.hrc b/filter/source/flash/impswfdialog.hrc
deleted file mode 100644
index 054078d..0000000
--- a/filter/source/flash/impswfdialog.hrc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define DLG_OPTIONS 1024
-
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define FI_DESCR 1
-#define FI_EXPORT_ALL_DESCR 2
-#define FI_EXPORT_BACKGROUNDS_DESCR 3
-#define FI_EXPORT_BACKGROUND_OBJECTS_DESCR 4
-#define FI_EXPORT_SLIDE_CONTENTS_DESCR 5
-#define FI_EXPORT_SOUND_DESCR 6
-#define FI_EXPORT_OLE_AS_JPEG_DESCR 7
-#define FI_EXPORT_MULTIPLE_FILES_DESCR 8
-#define NUM_FLD_QUALITY 1
-#define BOOL_EXPORT_ALL 1
-#define BOOL_EXPORT_BACKGROUNDS 2
-#define BOOL_EXPORT_BACKGROUND_OBJECTS 3
-#define BOOL_EXPORT_SLIDE_CONTENTS 4
-#define BOOL_EXPORT_SOUND 5
-#define BOOL_EXPORT_OLE_AS_JPEG 6
-#define BOOL_EXPORT_MULTIPLE_FILES 7
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx
index cc3fe05..4571de1 100644
--- a/filter/source/flash/impswfdialog.hxx
+++ b/filter/source/flash/impswfdialog.hxx
@@ -41,33 +41,21 @@ class Window;
class ImpSWFDialog : public ModalDialog
{
private:
- FixedInfo maFiDescr;
- NumericField maNumFldQuality;
- FixedInfo maFiExportAllDescr;
- CheckBox maCheckExportAll;
- FixedInfo maFiExportBackgroundsDescr;
- CheckBox maCheckExportBackgrounds;
- FixedInfo maFiExportBackgroundObjectsDescr;
- CheckBox maCheckExportBackgroundObjects;
- FixedInfo maFiExportSlideContentsDescr;
- CheckBox maCheckExportSlideContents;
- FixedInfo maFiExportSoundDescr;
- CheckBox maCheckExportSound;
- FixedInfo maFiExportOLEAsJPEGDescr;
- CheckBox maCheckExportOLEAsJPEG;
- FixedInfo maFiExportMultipleFilesDescr;
- CheckBox maCheckExportMultipleFiles;
-
- OKButton maBtnOK;
- CancelButton maBtnCancel;
- HelpButton maBtnHelp;
+ NumericField * mpNumFldQuality;
+ CheckBox * mpCheckExportAll;
+ CheckBox * mpCheckExportBackgrounds;
+ CheckBox * mpCheckExportBackgroundObjects;
+ CheckBox * mpCheckExportSlideContents;
+ CheckBox * mpCheckExportSound;
+ CheckBox * mpCheckExportOLEAsJPEG;
+ CheckBox * mpCheckExportMultipleFiles;
FilterConfigItem maConfigItem;
DECL_LINK( OnToggleCheckbox, CheckBox* );
public:
- ImpSWFDialog( Window* pParent, ResMgr& rResMgr,
+ ImpSWFDialog( Window* pParent,
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData );
~ImpSWFDialog();
diff --git a/filter/source/flash/impswfdialog.src b/filter/source/flash/impswfdialog.src
deleted file mode 100644
index 196f640..0000000
--- a/filter/source/flash/impswfdialog.src
+++ /dev/null
@@ -1,167 +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 "impswfdialog.hrc"
-
-ModalDialog DLG_OPTIONS
-{
- HelpID = "filter:ModalDialog:DLG_OPTIONS";
- Size = MAP_APPFONT ( 200 , 200 ) ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Text [ en-US ] = "Macromedia Flash (SWF) Options" ;
-
- FixedText FI_DESCR
- {
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 81 , 16 ) ;
- Text [ en-US ] = "1: min. quality\n100: max. quality" ;
- };
- NumericField NUM_FLD_QUALITY
- {
- HelpID = "filter:NumericField:DLG_OPTIONS:NUM_FLD_QUALITY";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 33 ) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
- TabStop = TRUE ;
- Spin = TRUE ;
- Minimum = 1;
- Maximum = 100 ;
- StrictFormat = TRUE ;
- Last = 100 ;
- Repeat = TRUE ;
- };
- CheckBox BOOL_EXPORT_ALL
- {
- HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_ALL";
- Pos = MAP_APPFONT ( 12 , 65 ) ;
- Size = MAP_APPFONT ( 10 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText FI_EXPORT_ALL_DESCR
- {
- Pos = MAP_APPFONT ( 25 , 65 ) ;
- Size = MAP_APPFONT ( 150 , 16 ) ;
- Text [ en-US ] = "Export All Slides (Uncheck exports current slide)" ;
- };
- CheckBox BOOL_EXPORT_MULTIPLE_FILES
- {
- HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_MULTIPLE_FILES";
- Pos = MAP_APPFONT ( 12 , 80 ) ;
- Size = MAP_APPFONT ( 10 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText FI_EXPORT_MULTIPLE_FILES_DESCR
- {
- Pos = MAP_APPFONT ( 25 , 80 ) ;
- Size = MAP_APPFONT ( 150 , 16 ) ;
- Text [ en-US ] = "Export As Multiple Files" ;
- };
- CheckBox BOOL_EXPORT_BACKGROUNDS
- {
- HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_BACKGROUNDS";
- Pos = MAP_APPFONT ( 22 , 95 ) ;
- Size = MAP_APPFONT ( 10 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText FI_EXPORT_BACKGROUNDS_DESCR
- {
- Pos = MAP_APPFONT ( 35 , 95 ) ;
- Size = MAP_APPFONT ( 100 , 16 ) ;
- Text [ en-US ] = "Export Backgrounds" ;
- };
- CheckBox BOOL_EXPORT_BACKGROUND_OBJECTS
- {
- HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_BACKGROUND_OBJECTS";
- Pos = MAP_APPFONT ( 22 , 107) ;
- Size = MAP_APPFONT ( 10 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText FI_EXPORT_BACKGROUND_OBJECTS_DESCR
- {
- Pos = MAP_APPFONT ( 35 , 107) ;
- Size = MAP_APPFONT ( 100 , 16 ) ;
- Text [ en-US ] = "Export Background Objects" ;
- };
- CheckBox BOOL_EXPORT_SLIDE_CONTENTS
- {
- HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_SLIDE_CONTENTS";
- Pos = MAP_APPFONT ( 22 , 119 ) ;
- Size = MAP_APPFONT ( 10 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText FI_EXPORT_SLIDE_CONTENTS_DESCR
- {
- Pos = MAP_APPFONT ( 35 , 119 ) ;
- Size = MAP_APPFONT ( 100 , 16 ) ;
- Text [ en-US ] = "Export Slide Contents" ;
- };
- CheckBox BOOL_EXPORT_SOUND
- {
- HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_SOUND";
- Pos = MAP_APPFONT ( 12 , 134 ) ;
- Size = MAP_APPFONT ( 10 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText FI_EXPORT_SOUND_DESCR
- {
- Pos = MAP_APPFONT ( 25 , 134 ) ;
- Size = MAP_APPFONT ( 100 , 16 ) ;
- Text [ en-US ] = "Export Verilogix Slide Annotations" ;
- };
- CheckBox BOOL_EXPORT_OLE_AS_JPEG
- {
- HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_OLE_AS_JPEG";
- Pos = MAP_APPFONT ( 12 , 146 ) ;
- Size = MAP_APPFONT ( 10 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText FI_EXPORT_OLE_AS_JPEG_DESCR
- {
- Pos = MAP_APPFONT ( 25 , 146 ) ;
- Size = MAP_APPFONT ( 100 , 16 ) ;
- Text [ en-US ] = "Export OLE Objects as JPEG images" ;
- };
-
-
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 12 , 180 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 70 , 180 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 140 , 180 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
-
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index 5d3201e..152aba4 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -184,7 +184,7 @@ Dialog* SWFDialog::createDialog( Window* pParent )
{
}
*/
- ImpSWFDialog* pDlg = new ImpSWFDialog( pParent, *mpResMgr, maFilterData );
+ ImpSWFDialog* pDlg = new ImpSWFDialog( pParent, maFilterData );
pRet = pDlg;
}
diff --git a/filter/uiconfig/ui/impswfdialog.ui b/filter/uiconfig/ui/impswfdialog.ui
new file mode 100644
index 0000000..436012f
--- /dev/null
+++ b/filter/uiconfig/ui/impswfdialog.ui
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustmentquality">
+ <property name="lower">1</property>
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkDialog" id="ImpSWFDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Macromedia Flash (SWF) Options</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">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="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">1: min. quality
+100: max. quality</property>
+ <property name="justify">fill</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="GtkSpinButton" id="quality">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="is_focus">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">â—</property>
+ <property name="xalign">0.5</property>
+ <property name="input_purpose">digits</property>
+ <property name="adjustment">adjustmentquality</property>
+ <property name="numeric">True</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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="exportall">
+ <property name="label" translatable="yes">Export _All Slides (Uncheck exports current slide)</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">1</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="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="exportmultiplefiles">
+ <property name="label" translatable="yes">Export As _Multiple Files</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="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">20</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="exportbackgrounds">
+ <property name="label" translatable="yes">Export _Backgrounds</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="exportbackgroundobjects">
+ <property name="label" translatable="yes">Export Back_ground Objects</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">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="exportslidecontents">
+ <property name="label" translatable="yes">Export _Slide Contents</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">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>
+ </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="GtkCheckButton" id="exportsound">
+ <property name="label" translatable="yes">Export _Verilogix Slide Annotations</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">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="exportoleasjpeg">
+ <property name="label" translatable="yes">Export OLE Objects as _JPEG images</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">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list