121 lines
4.1 KiB
Diff
121 lines
4.1 KiB
Diff
--- old/filter/source/xsltdialog/xmlfiltertestdialog.cxx 2023-09-15 17:13:26.077695741 +0300
|
|
+++ new/filter/source/xsltdialog/xmlfiltertestdialog.cxx 2023-09-15 17:40:32.221658074 +0300
|
|
@@ -557,13 +557,21 @@
|
|
if ( aDlg.Execute() == ERRCODE_NONE )
|
|
{
|
|
m_sImportRecentFile = aDlg.GetPath();
|
|
+#if defined(__LCC__) && (__LCC__ == 126)
|
|
+ new_import( m_sImportRecentFile );
|
|
+#else
|
|
import( m_sImportRecentFile );
|
|
+#endif
|
|
}
|
|
|
|
initDialog();
|
|
}
|
|
|
|
+#if defined(__LCC__) && (__LCC__ == 126)
|
|
+void XMLFilterTestDialog::new_import( const OUString& rURL )
|
|
+#else
|
|
void XMLFilterTestDialog::import( const OUString& rURL )
|
|
+#endif
|
|
{
|
|
try
|
|
{
|
|
@@ -641,7 +649,11 @@
|
|
}
|
|
else if (m_xPBRecentFile.get() == &rButton)
|
|
{
|
|
+#if defined(__LCC__) && (__LCC__ == 126)
|
|
+ new_import( m_sImportRecentFile );
|
|
+#else
|
|
import( m_sImportRecentFile );
|
|
+#endif
|
|
}
|
|
else if (m_xPBClose.get() == &rButton)
|
|
{
|
|
--- old/filter/source/xsltdialog/xmlfiltertestdialog.hxx 2023-09-15 17:25:22.601679144 +0300
|
|
+++ new/filter/source/xsltdialog/xmlfiltertestdialog.hxx 2023-09-15 17:28:44.985674456 +0300
|
|
@@ -49,7 +49,11 @@
|
|
void initDialog();
|
|
|
|
css::uno::Reference< css::lang::XComponent > getFrontMostDocument( const OUString& rServiceName );
|
|
+#if defined(__LCC__) && (__LCC__ == 126)
|
|
+ void new_import( const OUString& rURL );
|
|
+#else
|
|
void import( const OUString& rURL );
|
|
+#endif
|
|
static void displayXMLFile( const OUString& rURL );
|
|
void doExport( const css::uno::Reference< css::lang::XComponent >& xComp );
|
|
|
|
--- old/sc/source/ui/inc/dataproviderdlg.hxx 2023-09-18 14:52:30.655887724 +0300
|
|
+++ new/sc/source/ui/inc/dataproviderdlg.hxx 2023-09-18 14:54:19.699885198 +0300
|
|
@@ -67,7 +67,11 @@
|
|
void replaceNullTransformation();
|
|
void dateTimeTransformation();
|
|
|
|
+#if defined(__LCC__) && (__LCC__ == 126)
|
|
+ void new_import(ScDocument* pDoc, bool bInternal = false);
|
|
+#else
|
|
void import(ScDocument* pDoc, bool bInternal = false);
|
|
+#endif
|
|
};
|
|
|
|
#endif
|
|
--- old/sc/source/ui/miscdlgs/dataproviderdlg.cxx 2023-09-18 14:46:49.443895627 +0300
|
|
+++ new/sc/source/ui/miscdlgs/dataproviderdlg.cxx 2023-09-18 14:59:01.651878667 +0300
|
|
@@ -1051,7 +1051,11 @@
|
|
{
|
|
if (pCtrl == mpDataProviderCtrl.get())
|
|
{
|
|
+#if defined(__LCC__) && (__LCC__ == 126)
|
|
+ new_import(mpDoc.get(), true);
|
|
+#else
|
|
import(mpDoc.get(), true);
|
|
+#endif
|
|
}
|
|
}
|
|
|
|
@@ -1145,7 +1149,11 @@
|
|
|
|
}
|
|
|
|
+#if defined(__LCC__) && (__LCC__ == 126)
|
|
+void ScDataProviderDlg::new_import(ScDocument* pDoc, bool bInternal)
|
|
+#else
|
|
void ScDataProviderDlg::import(ScDocument* pDoc, bool bInternal)
|
|
+#endif
|
|
{
|
|
sc::ExternalDataSource aSource = mpDataProviderCtrl->getDataSource(pDoc);
|
|
|
|
--- old/sc/source/ui/view/cellsh2.cxx 2023-09-18 19:43:30.355483303 +0300
|
|
+++ new/sc/source/ui/view/cellsh2.cxx 2023-09-18 19:50:42.491473294 +0300
|
|
@@ -803,7 +803,11 @@
|
|
ScopedVclPtrInstance< ScDataProviderDlg > aDialog( pTabViewShell->GetDialogParent(), xDoc, pDoc);
|
|
if (aDialog->Execute() == RET_OK)
|
|
{
|
|
+#if defined(__LCC__) && (__LCC__ == 126)
|
|
+ aDialog->new_import(pDoc);
|
|
+#else
|
|
aDialog->import(pDoc);
|
|
+#endif
|
|
}
|
|
}
|
|
break;
|
|
--- old/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 2023-09-18 20:23:50.755427239 +0300
|
|
+++ new/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 2023-09-18 20:30:26.247418078 +0300
|
|
@@ -2116,8 +2116,13 @@
|
|
// gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class,
|
|
// so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated
|
|
// to RTLD_GLOBAL, so most probably a gcc bug.
|
|
+#if defined(__LCC__) && (__LCC__ == 126)
|
|
+ oox::FormulaImportBase& new_import = dynamic_cast<oox::FormulaImportBase&>(dynamic_cast<SfxBaseModel&>(*component));
|
|
+ new_import.readFormulaOoxml(buffer);
|
|
+#else
|
|
oox::FormulaImportBase& import = dynamic_cast<oox::FormulaImportBase&>(dynamic_cast<SfxBaseModel&>(*component));
|
|
import.readFormulaOoxml(buffer);
|
|
+#endif
|
|
if (isForwardEvents())
|
|
{
|
|
OOXMLPropertySet::Pointer_t pProps(new OOXMLPropertySet);
|