[Libreoffice-commits] .: 4 commits - filter/AllLangResTarget_xsltdlg.mk filter/source filter/uiconfig filter/UI_xsltdlg.mk svtools/source vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 22 02:24:40 PST 2012
filter/AllLangResTarget_xsltdlg.mk | 1
filter/UI_xsltdlg.mk | 1
filter/source/xsltdialog/hidother.src | 18
filter/source/xsltdialog/xmlfilterhelpids.hrc | 18
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 199 ++++-----
filter/source/xsltdialog/xmlfiltertestdialog.hrc | 44 --
filter/source/xsltdialog/xmlfiltertestdialog.hxx | 58 +-
filter/source/xsltdialog/xmlfiltertestdialog.src | 193 ---------
filter/uiconfig/ui/testxmlfilter.ui | 394 +++++++++++++++++++
svtools/source/filter/wmf/winwmf.cxx | 12
vcl/source/window/window2.cxx | 3
12 files changed, 527 insertions(+), 416 deletions(-)
New commits:
commit 90ddb6cce222580fc7dc3450c033e39edc01aecc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 21 16:28:50 2012 +0000
convert text xml filter dialog to .ui
Change-Id: I619b1495df376854a614239d59f68c565bbe9086
diff --git a/filter/AllLangResTarget_xsltdlg.mk b/filter/AllLangResTarget_xsltdlg.mk
index 30d73ba..e9c0cf4 100644
--- a/filter/AllLangResTarget_xsltdlg.mk
+++ b/filter/AllLangResTarget_xsltdlg.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_add_files,filter/xsltdlg,\
filter/source/xsltdialog/xmlfiltertabdialog.src \
filter/source/xsltdialog/xmlfiltertabpagebasic.src \
filter/source/xsltdialog/xmlfiltertabpagexslt.src \
- filter/source/xsltdialog/xmlfiltertestdialog.src \
filter/source/xsltdialog/xmlfileview.src \
filter/source/xsltdialog/xmlfilterdialogstrings.src \
))
diff --git a/filter/UI_xsltdlg.mk b/filter/UI_xsltdlg.mk
index 8d98876..6186789 100644
--- a/filter/UI_xsltdlg.mk
+++ b/filter/UI_xsltdlg.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UI_UI,filter))
$(eval $(call gb_UI_add_uifiles,filter,\
+ filter/uiconfig/ui/testxmlfilter \
filter/uiconfig/ui/xmlfiltersettings \
))
diff --git a/filter/source/xsltdialog/hidother.src b/filter/source/xsltdialog/hidother.src
index c6947c7..6bf0c4d 100644
--- a/filter/source/xsltdialog/hidother.src
+++ b/filter/source/xsltdialog/hidother.src
@@ -39,22 +39,4 @@ hidspecial HID_XML_FILTER_IMPORT_XSLT_BROWSE { HelpId = HID_XML_FILTE
hidspecial HID_XML_FILTER_IMPORT_TEMPLATE { HelpId = HID_XML_FILTER_IMPORT_TEMPLATE; };
hidspecial HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE { HelpId = HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE; };
-hidspecial HID_XML_FILTER_TEST_DIALOG { HelpId = HID_XML_FILTER_TEST_DIALOG; };
-
-hidspecial HID_XML_FILTER_TEST_EXPORT_BROWSE { HelpId = HID_XML_FILTER_TEST_EXPORT_BROWSE; };
-hidspecial HID_XML_FILTER_TEST_EXPORT_CURRENT { HelpId = HID_XML_FILTER_TEST_EXPORT_CURRENT; };
-hidspecial HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE { HelpId = HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE; };
-
-hidspecial HID_XML_FILTER_TEST_IMPORT_XSLT_FILE { HelpId = HID_XML_FILTER_TEST_IMPORT_XSLT_FILE; };
-hidspecial HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE { HelpId = HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE; };
-hidspecial HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE { HelpId = HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE; };
-hidspecial HID_XML_FILTER_TEST_IMPORT_BROWSE { HelpId = HID_XML_FILTER_TEST_IMPORT_BROWSE; };
-hidspecial HID_XML_FILTER_TEST_IMPORT_RECENT { HelpId = HID_XML_FILTER_TEST_IMPORT_RECENT; };
-hidspecial HID_XML_FILTER_TEST_IMPORT_RECENT_FILE { HelpId = HID_XML_FILTER_TEST_IMPORT_RECENT_FILE; };
-hidspecial HID_XML_FILTER_TEST_CLOSE { HelpId = HID_XML_FILTER_TEST_CLOSE; };
-
-hidspecial HID_XML_FILTER_TEST_VALIDATE_OUPUT { HelpId = HID_XML_FILTER_TEST_VALIDATE_OUPUT; };
-hidspecial HID_XML_FILTER_OUTPUT_WINDOW { HelpId = HID_XML_FILTER_OUTPUT_WINDOW; };
-
-hidspecial HID_XML_FILTER_TEST_EXPORT_XSLT_FILE { HelpId = HID_XML_FILTER_TEST_EXPORT_XSLT_FILE; };
hidspecial HID_XML_FILTER_TABPAGE_CTRL { HelpId = HID_XML_FILTER_TABPAGE_CTRL; };
diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc b/filter/source/xsltdialog/xmlfilterhelpids.hrc
index 338604d..cc18300 100644
--- a/filter/source/xsltdialog/xmlfilterhelpids.hrc
+++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc
@@ -38,27 +38,9 @@
#define HID_XML_FILTER_IMPORT_XSLT "FILTER_HID_XML_FILTER_IMPORT_XSLT"
#define HID_XML_FILTER_IMPORT_XSLT_BROWSE "FILTER_HID_XML_FILTER_IMPORT_XSLT_BROWSE"
#define HID_XML_FILTER_IMPORT_TEMPLATE "FILTER_HID_XML_FILTER_IMPORT_TEMPLATE"
-#define HID_XML_FILTER_TEST_DIALOG "FILTER_HID_XML_FILTER_TEST_DIALOG"
-
-#define HID_XML_FILTER_TEST_EXPORT_BROWSE "FILTER_HID_XML_FILTER_TEST_EXPORT_BROWSE"
-#define HID_XML_FILTER_TEST_EXPORT_CURRENT "FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT"
-#define HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE "FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE"
-
-#define HID_XML_FILTER_TEST_IMPORT_XSLT_FILE "FILTER_HID_XML_FILTER_TEST_IMPORT_XSLT_FILE"
-#define HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE "FILTER_HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE"
-#define HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE "FILTER_HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE"
-#define HID_XML_FILTER_TEST_IMPORT_BROWSE "FILTER_HID_XML_FILTER_TEST_IMPORT_BROWSE"
-#define HID_XML_FILTER_TEST_IMPORT_RECENT "FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT"
-#define HID_XML_FILTER_TEST_IMPORT_RECENT_FILE "FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT_FILE"
-#define HID_XML_FILTER_TEST_CLOSE "FILTER_HID_XML_FILTER_TEST_CLOSE"
#define HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE "FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE"
-#define HID_XML_FILTER_TEST_VALIDATE_OUPUT "FILTER_HID_XML_FILTER_TEST_VALIDATE_OUPUT"
-#define HID_XML_FILTER_OUTPUT_WINDOW "FILTER_HID_XML_FILTER_OUTPUT_WINDOW"
-
-#define HID_XML_FILTER_TEST_EXPORT_XSLT_FILE "FILTER_HID_XML_FILTER_TEST_EXPORT_XSLT_FILE"
-
#define HID_XML_FILTER_TABPAGE_CTRL "FILTER_HID_XML_FILTER_TABPAGE_CTRL"
#endif
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index d98b5cb..2fc72b4 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -783,7 +783,7 @@ void XMLFilterSettingsDialog::onTest()
{
filter_info_impl* pInfo = (filter_info_impl*)pEntry->GetUserData();
- XMLFilterTestDialog aDlg( this, *getXSLTDialogResMgr(), mxMSF );
+ XMLFilterTestDialog aDlg(this, mxMSF);
aDlg.test( *pInfo );
}
}
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 97c61f5..8141f02 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -50,7 +50,6 @@
#include "xmlfilterdialogstrings.hrc"
#include "xmlfiltersettingsdialog.hxx"
#include "xmlfiltertestdialog.hxx"
-#include "xmlfiltertestdialog.hrc"
using namespace utl;
@@ -136,47 +135,55 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString
return false;
}
-XMLFilterTestDialog::XMLFilterTestDialog( Window* pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF ) :
- ModalDialog( pParent, ResId( DLG_XML_FILTER_TEST_DIALOG, rResMgr ) ),
- mxMSF( rxMSF ),
-
- maFLExport( this, ResId( FL_EXPORT, rResMgr ) ),
- maFTExportXSLT( this, ResId( FT_EXPORT_XSLT, rResMgr ) ),
- maFTExportXSLTFile( this, ResId( FT_EXPORT_XSLT_FILE, rResMgr ) ),
- maFTTransformDocument( this, ResId( FT_TRANSFORM_DOCUMENT, rResMgr ) ),
- maPBExportBrowse( this, ResId( PB_EXPORT_BROWSE, rResMgr ) ),
- maPBCurrentDocument( this, ResId( PB_CURRENT_DOCUMENT, rResMgr ) ),
- maFTNameOfCurentFile( this, ResId( FT_NAME_OF_CURRENT_FILE, rResMgr ) ),
- maFLImport( this, ResId( FL_IMPORT, rResMgr ) ),
- maFTImportXSLT( this, ResId( FT_IMPORT_XSLT, rResMgr ) ),
- maFTImportXSLTFile( this, ResId( FT_IMPORT_XSLT_FILE, rResMgr ) ),
- maFTImportTemplate( this, ResId( FT_IMPORT_TEMPLATE, rResMgr ) ),
- maFTImportTemplateFile( this, ResId( FT_IMPORT_TEMPLATE_FILE, rResMgr ) ),
- maFTTransformFile( this, ResId( FT_TRANSFORM_FILE, rResMgr ) ),
- maCBXDisplaySource( this, ResId( CBX_DISPLAY_SOURCE, rResMgr ) ),
- maPBImportBrowse( this, ResId( PB_IMPORT_BROWSE, rResMgr ) ),
- maPBRecentDocument( this, ResId( PB_RECENT_DOCUMENT, rResMgr ) ),
- maFTNameOfRecentFile( this, ResId( FT_NAME_OF_RECENT_FILE, rResMgr ) ),
- maPBClose( this, ResId( PB_CLOSE, rResMgr ) ),
- maPBHelp( this, ResId( PB_HELP, rResMgr ) ),
- mpFilterInfo( NULL ),
- sDTDPath( RTL_CONSTASCII_USTRINGPARAM( "$(inst)/share/dtd/officedocument/1_0/office.dtd" ) )
+XMLFilterTestDialog::XMLFilterTestDialog(Window* pParent,
+ const Reference<XMultiServiceFactory>& rxMSF)
+ : ModalDialog(pParent, "TestXMLFilterDialog", "filter/ui/testxmlfilter.ui")
+ , mxMSF(rxMSF)
+ , m_pFilterInfo(NULL)
+ , m_sDTDPath("$(inst)/share/dtd/officedocument/1_0/office.dtd")
{
- FreeResource();
-
- maPBExportBrowse.SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
- maPBCurrentDocument.SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
- maPBImportBrowse.SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
- maPBRecentDocument.SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
- maPBClose.SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
-
- maDialogTitle = GetText();
+ get(m_pExport, "export");
+ get(m_pFTExportXSLTFile, "exportxsltfile");
+ get(m_pPBExportBrowse, "exportbrowse");
+ get(m_pPBCurrentDocument, "currentdocument");
+ get(m_pFTNameOfCurrentFile, "currentfilename");
+
+ get(m_pImport, "import");
+ get(m_pFTImportXSLTFile, "importxsltfile");
+ get(m_pFTImportTemplate, "templateimport");
+ get(m_pFTImportTemplateFile, "importxslttemplate");
+ get(m_pCBXDisplaySource, "displaysource");
+ get(m_pPBImportBrowse, "importbrowse");
+ get(m_pPBRecentFile, "recentfile");
+ get(m_pFTNameOfRecentFile, "recentfilename");
+
+ long nWidth =
+ std::max(m_pPBExportBrowse->get_preferred_size().Width(),
+ std::max(m_pPBCurrentDocument->get_preferred_size().Width(),
+ std::max(m_pPBImportBrowse->get_preferred_size().Width(),
+ m_pPBRecentFile->get_preferred_size().Width())));
+
+ //make sure that the second columns of the two disconnected
+ //grids are of equal width by ensuring that the widest
+ //entry in each equals
+ m_pPBExportBrowse->set_width_request(nWidth);
+ m_pPBImportBrowse->set_width_request(nWidth);
+
+ get(m_pPBClose, "close");
+
+ m_pPBExportBrowse->SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
+ m_pPBCurrentDocument->SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
+ m_pPBImportBrowse->SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
+ m_pPBRecentFile->SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
+ m_pPBClose->SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
+
+ m_sDialogTitle = GetText();
try
{
Reference< XConfigManager > xCfgMgr( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ))), UNO_QUERY );
if( xCfgMgr.is() )
- sDTDPath = xCfgMgr->substituteVariables( sDTDPath );
+ m_sDTDPath = xCfgMgr->substituteVariables( m_sDTDPath );
mxGlobalBroadcaster = Reference < XEventBroadcaster >( GlobalEventBroadcaster::create(comphelper::getComponentContext(mxMSF)), UNO_QUERY_THROW );
mxGlobalEventListener = new GlobalEventListenerImpl( this );
@@ -200,15 +207,15 @@ XMLFilterTestDialog::~XMLFilterTestDialog()
OSL_FAIL( "XMLFilterTestDialog::~XMLFilterTestDialog exception catched!" );
}
- delete mpFilterInfo;
+ delete m_pFilterInfo;
}
void XMLFilterTestDialog::test( const filter_info_impl& rFilterInfo )
{
- delete mpFilterInfo;
- mpFilterInfo = new filter_info_impl( rFilterInfo );
+ delete m_pFilterInfo;
+ m_pFilterInfo = new filter_info_impl( rFilterInfo );
- maImportRecentFile = OUString();
+ m_sImportRecentFile = OUString();
initDialog();
@@ -226,16 +233,16 @@ void XMLFilterTestDialog::updateCurrentDocumentButtonState( Reference< XComponen
{
if( pRef && pRef->is() )
{
- if( checkComponent( *pRef, mpFilterInfo->maDocumentService ) )
+ if( checkComponent( *pRef, m_pFilterInfo->maDocumentService ) )
mxLastFocusModel = *pRef;
}
- bool bExport = (mpFilterInfo->maFlags & 2) == 2;
+ bool bExport = (m_pFilterInfo->maFlags & 2) == 2;
Reference< XComponent > xCurrentDocument;
if( bExport )
- xCurrentDocument = getFrontMostDocument( mpFilterInfo->maDocumentService );
- maPBCurrentDocument.Enable( bExport && xCurrentDocument.is() );
- maFTNameOfCurentFile.Enable( bExport && xCurrentDocument.is() );
+ xCurrentDocument = getFrontMostDocument( m_pFilterInfo->maDocumentService );
+ m_pPBCurrentDocument->Enable( bExport && xCurrentDocument.is() );
+ m_pFTNameOfCurrentFile->Enable( bExport && xCurrentDocument.is() );
if( xCurrentDocument.is() )
{
@@ -263,50 +270,40 @@ void XMLFilterTestDialog::updateCurrentDocumentButtonState( Reference< XComponen
}
}
- maFTNameOfCurentFile.SetText( aTitle );
+ m_pFTNameOfCurrentFile->SetText( aTitle );
}
}
void XMLFilterTestDialog::initDialog()
{
- DBG_ASSERT( mpFilterInfo, "i need a filter I can test!" );
- if( NULL == mpFilterInfo )
+ DBG_ASSERT( m_pFilterInfo, "i need a filter I can test!" );
+ if( NULL == m_pFilterInfo )
return;
- String aTitle( maDialogTitle );
- aTitle.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM("%s") ), mpFilterInfo->maFilterName );
+ String aTitle( m_sDialogTitle );
+ aTitle.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM("%s") ), m_pFilterInfo->maFilterName );
SetText( aTitle );
String aEmpty;
- bool bImport = (mpFilterInfo->maFlags & 1) == 1;
- bool bExport = (mpFilterInfo->maFlags & 2) == 2;
+ bool bImport = (m_pFilterInfo->maFlags & 1) == 1;
+ bool bExport = (m_pFilterInfo->maFlags & 2) == 2;
updateCurrentDocumentButtonState();
- maFLExport.Enable( bExport );
- maFTExportXSLT.Enable( bExport );
- maFTExportXSLTFile.Enable( bExport );
- maFTTransformDocument.Enable( bExport );
- maPBExportBrowse.Enable( bExport );
-
- maFTExportXSLTFile.SetText( getFileNameFromURL( mpFilterInfo->maExportXSLT ) );
+ m_pExport->Enable(bExport);
+ m_pFTExportXSLTFile->SetText( getFileNameFromURL( m_pFilterInfo->maExportXSLT ) );
// ---
- maFLImport.Enable( bImport );
- maFTImportXSLT.Enable( bImport );
- maFTImportXSLTFile.Enable( bImport );
- maFTImportTemplate.Enable( bImport && !mpFilterInfo->maImportTemplate.isEmpty() );
- maFTImportTemplateFile.Enable( bImport && !mpFilterInfo->maImportTemplate.isEmpty() );
- maFTTransformFile.Enable( bImport );
- maCBXDisplaySource.Enable( bImport );
- maPBImportBrowse.Enable( bImport );
- maPBRecentDocument.Enable( bImport && !maImportRecentFile.isEmpty() );
- maFTNameOfRecentFile.Enable( bImport && !maImportRecentFile.isEmpty() );
-
- maFTImportXSLTFile.SetText( getFileNameFromURL( mpFilterInfo->maImportXSLT ) );
- maFTImportTemplateFile.SetText( getFileNameFromURL( mpFilterInfo->maImportTemplate ) );
- maFTNameOfRecentFile.SetText( getFileNameFromURL( maImportRecentFile ) );
+ m_pImport->Enable(bImport);
+ m_pFTImportTemplate->Enable(bImport && !m_pFilterInfo->maImportTemplate.isEmpty());
+ m_pFTImportTemplateFile->Enable(bImport && !m_pFilterInfo->maImportTemplate.isEmpty());
+ m_pPBRecentFile->Enable(bImport && !m_sImportRecentFile.isEmpty());
+ m_pFTNameOfRecentFile->Enable(bImport && !m_sImportRecentFile.isEmpty());
+
+ m_pFTImportXSLTFile->SetText( getFileNameFromURL( m_pFilterInfo->maImportXSLT ) );
+ m_pFTImportTemplateFile->SetText( getFileNameFromURL( m_pFilterInfo->maImportTemplate ) );
+ m_pFTNameOfRecentFile->SetText( getFileNameFromURL( m_sImportRecentFile ) );
}
void XMLFilterTestDialog::onExportBrowse()
@@ -365,7 +362,7 @@ void XMLFilterTestDialog::onExportBrowse()
}
- if( (nFound == 15) && (!aType.isEmpty() && aService == mpFilterInfo->maDocumentService) )
+ if( (nFound == 15) && (!aType.isEmpty() && aService == m_pFilterInfo->maDocumentService) )
{
// see if this filter is not supressed in dialog
if( (nFlags & 0x1000) == 0 )
@@ -417,11 +414,11 @@ void XMLFilterTestDialog::onExportBrowse()
}
}
- aDlg.SetDisplayDirectory( maExportRecentFile );
+ aDlg.SetDisplayDirectory( m_sExportRecentFile );
if ( aDlg.Execute() == ERRCODE_NONE )
{
- maExportRecentFile = aDlg.GetPath();
+ m_sExportRecentFile = aDlg.GetPath();
Reference< XComponentLoader > xLoader( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY );
Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) );
@@ -431,7 +428,7 @@ void XMLFilterTestDialog::onExportBrowse()
Sequence< PropertyValue > aArguments(1);
aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
aArguments[0].Value <<= xInter;
- Reference< XComponent > xComp( xLoader->loadComponentFromURL( maExportRecentFile, aFrame, 0, aArguments ) );
+ Reference< XComponent > xComp( xLoader->loadComponentFromURL( m_sExportRecentFile, aFrame, 0, aArguments ) );
if( xComp.is() )
{
doExport( xComp );
@@ -449,7 +446,7 @@ void XMLFilterTestDialog::onExportBrowse()
void XMLFilterTestDialog::onExportCurrentDocument()
{
- doExport( getFrontMostDocument( mpFilterInfo->maDocumentService ) );
+ doExport( getFrontMostDocument( m_pFilterInfo->maDocumentService ) );
}
void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
@@ -464,7 +461,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
utl::TempFile aTempFile(leadingChars, &ext);
OUString aTempFileURL( aTempFile.GetURL() );
- const application_info_impl* pAppInfo = getApplicationInfo( mpFilterInfo->maExportService );
+ const application_info_impl* pAppInfo = getApplicationInfo( m_pFilterInfo->maExportService );
if( pAppInfo )
{
File aOutputFile( aTempFileURL );
@@ -473,8 +470,8 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
// create xslt exporter
Reference< XOutputStream > xIS( new comphelper::OSLOutputStreamWrapper( aOutputFile ) );
- int bUseDTD = mpFilterInfo->maDTD.isEmpty() ? 0 : 1 ;
- int bUseDocType = mpFilterInfo->maDocType.isEmpty() ? 0 : 1;
+ int bUseDTD = m_pFilterInfo->maDTD.isEmpty() ? 0 : 1 ;
+ int bUseDocType = m_pFilterInfo->maDocType.isEmpty() ? 0 : 1;
Sequence< PropertyValue > aSourceData( 2 + bUseDTD + bUseDocType );
int i = 0;
@@ -487,20 +484,20 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
if( bUseDTD )
{
aSourceData[i ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("DocType_System"));
- aSourceData[i++].Value <<= mpFilterInfo->maDTD;
+ aSourceData[i++].Value <<= m_pFilterInfo->maDTD;
}
if( bUseDocType )
{
aSourceData[i ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("DocType_Public"));
- aSourceData[i++].Value <<= mpFilterInfo->maDocType;
+ aSourceData[i++].Value <<= m_pFilterInfo->maDocType;
}
Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" )) ), UNO_QUERY );
Reference< XDocumentHandler > xHandler( xExporter, UNO_QUERY );
if( xHandler.is() )
{
- Sequence< OUString > aFilterUserData( mpFilterInfo->getFilterUserData() );
+ Sequence< OUString > aFilterUserData( m_pFilterInfo->getFilterUserData() );
xExporter->exporter( aSourceData, aFilterUserData );
Reference< XMultiServiceFactory > xDocFac( xComp, UNO_QUERY );
@@ -566,14 +563,14 @@ void XMLFilterTestDialog::onImportBrowse()
// Open Fileopen-Dialog
::sfx2::FileDialogHelper aDlg(
com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
- String aFilterName( mpFilterInfo->maInterfaceName );
+ String aFilterName( m_pFilterInfo->maInterfaceName );
String aExtensions;
int nLastIndex = 0;
int nCurrentIndex = 0;
for( int i = 0; nLastIndex != -1; i++ )
{
- nLastIndex = mpFilterInfo->maExtension.indexOf( sal_Unicode( ';' ), nLastIndex );
+ nLastIndex = m_pFilterInfo->maExtension.indexOf( sal_Unicode( ';' ), nLastIndex );
if( i > 0 )
aExtensions += ';';
@@ -583,11 +580,11 @@ void XMLFilterTestDialog::onImportBrowse()
if( nLastIndex == -1 )
{
- aExtensions += String( mpFilterInfo->maExtension.copy( nCurrentIndex ) );
+ aExtensions += String( m_pFilterInfo->maExtension.copy( nCurrentIndex ) );
}
else
{
- aExtensions += String( mpFilterInfo->maExtension.copy( nCurrentIndex, nLastIndex - nCurrentIndex ) );
+ aExtensions += String( m_pFilterInfo->maExtension.copy( nCurrentIndex, nLastIndex - nCurrentIndex ) );
nCurrentIndex = nLastIndex + 1;
nLastIndex = nCurrentIndex;
}
@@ -598,12 +595,12 @@ void XMLFilterTestDialog::onImportBrowse()
aFilterName += sal_Unicode(')');
aDlg.AddFilter( aFilterName, aExtensions );
- aDlg.SetDisplayDirectory( maImportRecentFile );
+ aDlg.SetDisplayDirectory( m_sImportRecentFile );
if ( aDlg.Execute() == ERRCODE_NONE )
{
- maImportRecentFile = aDlg.GetPath();
- import( maImportRecentFile );
+ m_sImportRecentFile = aDlg.GetPath();
+ import( m_sImportRecentFile );
}
initDialog();
@@ -611,7 +608,7 @@ void XMLFilterTestDialog::onImportBrowse()
void XMLFilterTestDialog::onImportRecentDocument()
{
- import( maImportRecentFile );
+ import( m_sImportRecentFile );
}
void XMLFilterTestDialog::import( const OUString& rURL )
@@ -626,14 +623,14 @@ void XMLFilterTestDialog::import( const OUString& rURL )
OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
Sequence< PropertyValue > aArguments(2);
aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
- aArguments[0].Value <<= mpFilterInfo->maFilterName;
+ aArguments[0].Value <<= m_pFilterInfo->maFilterName;
aArguments[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
aArguments[1].Value <<= xInter;
xLoader->loadComponentFromURL( rURL, aFrame, 0, aArguments );
}
- if( maCBXDisplaySource.IsChecked() )
+ if( m_pCBXDisplaySource->IsChecked() )
{
String lead;
String ext(RTL_CONSTASCII_USTRINGPARAM(".xml"));
@@ -664,7 +661,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
aSourceData[i++].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" ));
aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "DocType_System" ));
- aSourceData[i++].Value <<= sDTDPath;
+ aSourceData[i++].Value <<= m_sDTDPath;
Reference< XWriter > xWriter = Writer::create( comphelper::getComponentContext(mxMSF) );
@@ -675,7 +672,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
Reference< XActiveDataSource > xDocSrc( xWriter, UNO_QUERY );
xDocSrc->setOutputStream( xOS );
- Sequence< OUString > aFilterUserData( mpFilterInfo->getFilterUserData() );
+ Sequence< OUString > aFilterUserData( m_pFilterInfo->getFilterUserData() );
xImporter->importer( aSourceData, Reference<XDocumentHandler>(xWriter, UNO_QUERY_THROW), aFilterUserData );
}
@@ -690,23 +687,23 @@ void XMLFilterTestDialog::import( const OUString& rURL )
IMPL_LINK(XMLFilterTestDialog, ClickHdl_Impl, PushButton *, pButton )
{
- if( &maPBExportBrowse == pButton )
+ if (m_pPBExportBrowse == pButton)
{
onExportBrowse();
}
- else if( &maPBCurrentDocument == pButton )
+ else if (m_pPBCurrentDocument == pButton)
{
onExportCurrentDocument();
}
- else if( &maPBImportBrowse == pButton )
+ else if (m_pPBImportBrowse == pButton)
{
onImportBrowse();
}
- else if( &maPBRecentDocument == pButton )
+ else if (m_pPBRecentFile == pButton)
{
onImportRecentDocument();
}
- else if( &maPBClose == pButton )
+ else if (m_pPBClose == pButton)
{
Close();
}
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hrc b/filter/source/xsltdialog/xmlfiltertestdialog.hrc
deleted file mode 100644
index 592c98e..0000000
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hrc
+++ /dev/null
@@ -1,44 +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 .
- */
-
-#ifndef _XMLFILTERTESTDIALOG_HRC_
-#define _XMLFILTERTESTDIALOG_HRC_
-
-#include "xmlfiltercommon.hrc"
-
-#define FL_EXPORT 1
-#define FT_EXPORT_XSLT 2
-#define FT_EXPORT_XSLT_FILE 3
-#define FT_TRANSFORM_DOCUMENT 4
-#define PB_EXPORT_BROWSE 5
-#define PB_CURRENT_DOCUMENT 6
-#define FT_NAME_OF_CURRENT_FILE 7
-#define FL_IMPORT 8
-#define FT_IMPORT_XSLT 9
-#define FT_IMPORT_XSLT_FILE 10
-#define FT_IMPORT_TEMPLATE 11
-#define FT_IMPORT_TEMPLATE_FILE 12
-#define FT_TRANSFORM_FILE 13
-#define CBX_DISPLAY_SOURCE 14
-#define PB_IMPORT_BROWSE 15
-#define PB_RECENT_DOCUMENT 16
-#define FT_NAME_OF_RECENT_FILE 17
-#define PB_HELP 18
-#define PB_CLOSE 19
-
-#endif
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index d035d36..7121e04 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -22,10 +22,11 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
#include <svl/poolitem.hxx>
class filter_info_impl;
@@ -33,7 +34,8 @@ class filter_info_impl;
class XMLFilterTestDialog : public ModalDialog
{
public:
- XMLFilterTestDialog( Window* pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+ XMLFilterTestDialog(Window* pParent,
+ const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF);
virtual ~XMLFilterTestDialog();
void test( const filter_info_impl& rFilterInfo );
@@ -60,34 +62,30 @@ private:
com::sun::star::uno::Reference< com::sun::star::document::XEventListener > mxGlobalEventListener;
com::sun::star::uno::WeakReference< com::sun::star::lang::XComponent > mxLastFocusModel;
- rtl::OUString maImportRecentFile;
- rtl::OUString maExportRecentFile;
-
- FixedLine maFLExport;
- FixedText maFTExportXSLT;
- FixedText maFTExportXSLTFile;
- FixedText maFTTransformDocument;
- PushButton maPBExportBrowse;
- PushButton maPBCurrentDocument;
- FixedText maFTNameOfCurentFile;
- FixedLine maFLImport;
- FixedText maFTImportXSLT;
- FixedText maFTImportXSLTFile;
- FixedText maFTImportTemplate;
- FixedText maFTImportTemplateFile;
- FixedText maFTTransformFile;
- CheckBox maCBXDisplaySource;
- PushButton maPBImportBrowse;
- PushButton maPBRecentDocument;
- FixedText maFTNameOfRecentFile;
- PushButton maPBClose;
- HelpButton maPBHelp;
-
- filter_info_impl* mpFilterInfo;
-
- String maDialogTitle;
-
- ::rtl::OUString sDTDPath;
+ OUString m_sImportRecentFile;
+ OUString m_sExportRecentFile;
+
+ VclContainer* m_pExport;
+ FixedText* m_pFTExportXSLTFile;
+ PushButton* m_pPBExportBrowse;
+ PushButton* m_pPBCurrentDocument;
+ FixedText* m_pFTNameOfCurrentFile;
+
+ VclContainer* m_pImport;
+ FixedText* m_pFTImportXSLTFile;
+ FixedText* m_pFTImportTemplate;
+ FixedText* m_pFTImportTemplateFile;
+ CheckBox* m_pCBXDisplaySource;
+ PushButton* m_pPBImportBrowse;
+ PushButton* m_pPBRecentFile;
+ FixedText* m_pFTNameOfRecentFile;
+ PushButton* m_pPBClose;
+
+ filter_info_impl* m_pFilterInfo;
+
+ OUString m_sDialogTitle;
+
+ OUString m_sDTDPath;
};
#endif
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.src b/filter/source/xsltdialog/xmlfiltertestdialog.src
deleted file mode 100644
index 2011ec4..0000000
--- a/filter/source/xsltdialog/xmlfiltertestdialog.src
+++ /dev/null
@@ -1,193 +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 .
- */
-
-#include "xmlfiltertestdialog.hrc"
-#include "xmlfilterhelpids.hrc"
-
-#define DIALOG_WIDTH 200
-#define DIALOG_HEIGHT 230
-
-#define SPACING 3
-
-#define FIRST_ROW_X 6
-#define FIRST_ROW_Y 6
-#define COLUMN_WIDTH ((DIALOG_WIDTH-(5*SPACING))/2)
-
-#define SECOND_ROW_X FIRST_ROW_X + COLUMN_WIDTH+SPACING
-
-#define FIXED_TEXT_OFFSET 3
-
-#define ROW_HEIGHT 14
-
-ModalDialog DLG_XML_FILTER_TEST_DIALOG
-{
- HelpId = HID_XML_FILTER_TEST_DIALOG;
- Size = MAP_APPFONT( DIALOG_WIDTH, DIALOG_HEIGHT );
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Text [ en-US ] = "Test XML Filter: %s" ;
-
- FixedLine FL_EXPORT
- {
- Pos = MAP_APPFONT( 4, FIRST_ROW_Y + 0 * ROW_HEIGHT + 0 * SPACING + FIXED_TEXT_OFFSET);
- Size = MAP_APPFONT( DIALOG_WIDTH - 2*SPACING, 8 );
- Text [ en-US ] = "Export";
- };
-
- FixedText FT_EXPORT_XSLT
- {
- Pos = MAP_APPFONT ( FIRST_ROW_X , FIRST_ROW_Y + 1 * ROW_HEIGHT + 1 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 8 ) ;
- Text [ en-US ] = "XSLT for export";
- };
-
- FixedText FT_EXPORT_XSLT_FILE
- {
- Pos = MAP_APPFONT ( SECOND_ROW_X , FIRST_ROW_Y + 1 * ROW_HEIGHT + 1 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( 2*COLUMN_WIDTH , 8 ) ;
- HelpId = HID_XML_FILTER_TEST_EXPORT_XSLT_FILE;
- };
-
- FixedText FT_TRANSFORM_DOCUMENT
- {
- Pos = MAP_APPFONT ( FIRST_ROW_X , FIRST_ROW_Y + 2 * ROW_HEIGHT + 2 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 8 ) ;
- Text [ en-US ] = "Transform document";
- };
-
- PushButton PB_EXPORT_BROWSE
- {
- Pos = MAP_APPFONT ( SECOND_ROW_X , FIRST_ROW_Y + 2 * ROW_HEIGHT + 2 * SPACING ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 14 ) ;
- TabStop = TRUE ;
- HelpId = HID_XML_FILTER_TEST_EXPORT_BROWSE;
- Text [ en-US ] = "~Browse...";
- };
-
- PushButton PB_CURRENT_DOCUMENT
- {
- Pos = MAP_APPFONT ( SECOND_ROW_X , FIRST_ROW_Y + 3 * ROW_HEIGHT + 3 * SPACING ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 14 ) ;
- HelpId = HID_XML_FILTER_TEST_EXPORT_CURRENT;
- TabStop = TRUE ;
- Text [ en-US ] = "~Current Document";
- };
-
- FixedText FT_NAME_OF_CURRENT_FILE
- {
- Pos = MAP_APPFONT ( FIRST_ROW_X , FIRST_ROW_Y + 4 * ROW_HEIGHT + 4 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( 2*COLUMN_WIDTH , 8 ) ;
- HelpId = HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE;
- Right = TRUE;
- };
-
- // import ---------------------------------------------------------
-
- FixedLine FL_IMPORT
- {
- Pos = MAP_APPFONT( 4, FIRST_ROW_Y + 5 * ROW_HEIGHT + 5 * SPACING + FIXED_TEXT_OFFSET );
- Size = MAP_APPFONT( DIALOG_WIDTH - 2*SPACING, 8 );
- Text [ en-US ] = "Import";
- };
-
- FixedText FT_IMPORT_XSLT
- {
- Pos = MAP_APPFONT ( FIRST_ROW_X , FIRST_ROW_Y + 6 * ROW_HEIGHT + 6 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 8 ) ;
- Text [ en-US ] = "XSLT for import";
- };
-
- FixedText FT_IMPORT_XSLT_FILE
- {
- Pos = MAP_APPFONT ( SECOND_ROW_X , FIRST_ROW_Y + 6 * ROW_HEIGHT + 6 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( 2*COLUMN_WIDTH , 8 ) ;
- HelpId = HID_XML_FILTER_TEST_IMPORT_XSLT_FILE;
- };
-
- FixedText FT_IMPORT_TEMPLATE
- {
- Pos = MAP_APPFONT ( FIRST_ROW_X , FIRST_ROW_Y + 7 * ROW_HEIGHT + 7 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 8 ) ;
- Text [ en-US ] = "Template for import";
- };
-
- FixedText FT_IMPORT_TEMPLATE_FILE
- {
- Pos = MAP_APPFONT ( SECOND_ROW_X , FIRST_ROW_Y + 7 * ROW_HEIGHT + 7 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( 2*COLUMN_WIDTH , 8 ) ;
- HelpId = HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE;
- };
-
- FixedText FT_TRANSFORM_FILE
- {
- Pos = MAP_APPFONT ( FIRST_ROW_X , FIRST_ROW_Y + 8 * ROW_HEIGHT + 8 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 8 ) ;
- Text [ en-US ] = "Transform file";
- };
-
- CheckBox CBX_DISPLAY_SOURCE
- {
- Pos = MAP_APPFONT ( SECOND_ROW_X , FIRST_ROW_Y + 8 * ROW_HEIGHT + 8 * SPACING + 1 ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 10 ) ;
- HelpId = HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE;
- Text [ en-US ] = "~Display source";
- };
-
- PushButton PB_IMPORT_BROWSE
- {
- Pos = MAP_APPFONT ( SECOND_ROW_X , FIRST_ROW_Y + 9 * ROW_HEIGHT + 9 * SPACING ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 14 ) ;
- HelpId = HID_XML_FILTER_TEST_IMPORT_BROWSE;
- TabStop = TRUE ;
- Text [ en-US ] = "B~rowse...";
- };
-
- PushButton PB_RECENT_DOCUMENT
- {
- Pos = MAP_APPFONT ( SECOND_ROW_X , FIRST_ROW_Y + 10 * ROW_HEIGHT + 10 * SPACING ) ;
- Size = MAP_APPFONT ( COLUMN_WIDTH , 14 ) ;
- HelpId = HID_XML_FILTER_TEST_IMPORT_RECENT;
- TabStop = TRUE ;
- Text [ en-US ] = "~Recent File";
- };
-
- FixedText FT_NAME_OF_RECENT_FILE
- {
- Pos = MAP_APPFONT ( FIRST_ROW_X , FIRST_ROW_Y + 11 * ROW_HEIGHT + 11 * SPACING + FIXED_TEXT_OFFSET ) ;
- Size = MAP_APPFONT ( 2*COLUMN_WIDTH, 8 ) ;
- HelpId = HID_XML_FILTER_TEST_IMPORT_RECENT_FILE;
- Right = TRUE;
- };
-
- PushButton PB_CLOSE
- {
- Pos = MAP_APPFONT ( DIALOG_WIDTH - 2*50 - 2*6 , DIALOG_HEIGHT - 6 - 14 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- HelpId = HID_XML_FILTER_TEST_CLOSE;
- TabStop = TRUE ;
- Text [ en-US ] = "~Close";
- };
-
- HelpButton PB_HELP
- {
- Pos = MAP_APPFONT ( DIALOG_WIDTH - 1*50 - 1*6 , DIALOG_HEIGHT - 6 - 14 );
- Size = MAP_APPFONT ( 50, 14 );
- };
-};
diff --git a/filter/uiconfig/ui/testxmlfilter.ui b/filter/uiconfig/ui/testxmlfilter.ui
new file mode 100644
index 0000000..fee4a79
--- /dev/null
+++ b/filter/uiconfig/ui/testxmlfilter.ui
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="TestXMLFilterDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Test XML Filter: %s</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">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</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_action_appearance">False</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="help">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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>
+ </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="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkFrame" id="export">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <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">XSLT for export</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="label4">
+ <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">Transform document</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="GtkButton" id="exportbrowse">
+ <property name="label" translatable="yes">Browse...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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>
+ <object class="GtkButton" id="currentdocument">
+ <property name="label" translatable="yes">Current Document</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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="exportxsltfile">
+ <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="GtkLabel" id="currentfilename">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="width_chars">52</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Export</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="import">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <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">XSLT for import</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="GtkButton" id="importbrowse">
+ <property name="label" translatable="yes">Browse...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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="GtkButton" id="recentfile">
+ <property name="label" translatable="yes">Recent File</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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="GtkLabel" id="templateimport">
+ <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">Template for import</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="importxsltfile">
+ <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="GtkCheckButton" id="displaysource">
+ <property name="label" translatable="yes">Display source</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">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">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="label6">
+ <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">Transform file</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="GtkLabel" id="importxslttemplate">
+ <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">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="recentfilename">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="width_chars">52</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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Import</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">close</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 5c74680a377f6f55b136b2ab406b1608a215f432
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 21 20:55:10 2012 +0000
use MNEMONIC_CHAR define
Change-Id: I824bd1ad981e0b37e273a054e2a64cb500776180
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index be8c8ba..c0d013d 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -28,6 +28,7 @@
#include <vcl/layout.hxx>
#include <vcl/timer.hxx>
#include <vcl/metric.hxx>
+#include <vcl/mnemonic.hxx>
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
#include <vcl/scrbar.hxx>
@@ -1967,7 +1968,7 @@ namespace
if (aRet[nI] == '_')
{
if (aRet[nI+1] != '_')
- aRet[nI] = '~';
+ aRet[nI] = MNEMONIC_CHAR;
else
aRet.remove(nI, 1);
++nI;
commit b8adb1e66085d39014ad26593097eb16a8fb59df
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 21 17:11:43 2012 +0000
seekrel(-6) + read(4) into discard + seekrel(2) == noop
seek backwards 6 bytes
read a 4 byte value into a variable that's never used
seek forward 2 bytes
Change-Id: I1e3ac7606dedb394c571e4589b34cfe050a28fc8
diff --git a/svtools/source/filter/wmf/winwmf.cxx b/svtools/source/filter/wmf/winwmf.cxx
index beacfa6..f9f38e0 100644
--- a/svtools/source/filter/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
@@ -1419,12 +1419,8 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
case W_META_EXTTEXTOUT:
{
sal_uInt16 nLen, nOptions;
- sal_Int32 nRecordSize;
Point aPosition;
- pStm->SeekRel(-6);
- *pStm >> nRecordSize;
- pStm->SeekRel(2);
aPosition = ReadYX();
*pStm >> nLen >> nOptions;
// todo: we also have to take care of the text width
commit 810aab9e2f4927a7fcfacae62d5b36b074985250
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 21 17:07:35 2012 +0000
loplugin: unused Point aPos0 and Rectangle aRect
Change-Id: Ib0960cca6141ac28958c80aa8d716a98abef1f8d
diff --git a/svtools/source/filter/wmf/winwmf.cxx b/svtools/source/filter/wmf/winwmf.cxx
index 063a7a9..beacfa6 100644
--- a/svtools/source/filter/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
@@ -368,7 +368,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
nPoints += pnPoints[i];
}
- SAL_WARN_IF(!bRecordOk, "svtools", "polypolygon record has more polygons than we can handle");
+ SAL_WARN_IF(!bRecordOk, "svtools.filter", "polypolygon record has more polygons than we can handle");
bRecordOk &= pWMF->good();
@@ -1301,8 +1301,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
case W_META_SETWINDOWEXT:
{
- Point aPos0( 0, 0 );
- sal_Int16 nWidth, nHeight;
+ sal_Int16 nWidth(0), nHeight(0);
*pStm >> nHeight >> nWidth;
rPlaceableBound.SetSize( Size( nWidth, nHeight ) );
}
@@ -1363,7 +1362,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
nPoints += nP;
}
- SAL_WARN_IF(!bRecordOk, "svtools", "polypolygon record has more polygons than we can handle");
+ SAL_WARN_IF(!bRecordOk, "svtools.filter", "polypolygon record has more polygons than we can handle");
bRecordOk &= pStm->good();
@@ -1422,7 +1421,6 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
sal_uInt16 nLen, nOptions;
sal_Int32 nRecordSize;
Point aPosition;
- Rectangle aRect;
pStm->SeekRel(-6);
*pStm >> nRecordSize;
More information about the Libreoffice-commits
mailing list