summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sfx2/tabdlg.hxx1
-rw-r--r--include/svx/xpoly.hxx2
-rw-r--r--include/tools/zcodec.hxx1
-rw-r--r--sc/Module_sc.mk26
-rw-r--r--sfx2/source/appl/newhelp.hxx5
-rw-r--r--svx/source/svdraw/svdedtv1.cxx2
-rw-r--r--sw/source/uibase/shells/tabsh.cxx16
-rw-r--r--sw/source/uibase/shells/textsh1.cxx2
-rw-r--r--sw/source/uibase/uno/loktxdoc.cxx2
-rw-r--r--vcl/qa/cppunit/pdfexport/pdfexport2.cxx14
-rw-r--r--vcl/source/window/menufloatingwindow.hxx1
-rw-r--r--vcl/unx/gtk3_kde5/FPServiceInfo.hxx3
-rw-r--r--xmloff/source/transform/TransformerAction.hxx1
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssrenam.h1
14 files changed, 36 insertions, 41 deletions
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index b63bac0db100..6559416094a5 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -45,7 +45,6 @@ struct TabDlg_Impl;
namespace com::sun::star::frame { class XFrame; }
#define RET_USER 100
-#define RET_USER_CANCEL 101
class SFX2_DLLPUBLIC SfxTabDialogItem final : public SfxSetItem
{
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index 24a61f209d46..9d550aeda364 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -34,10 +34,8 @@ namespace tools {
}
class OutputDevice;
-#define XPOLYPOLY_APPEND 0xFFFF
#define XPOLY_APPEND 0xFFFF
-
// Class XPolygon has a point-array and a flag-array, which contains information about a particular point
class ImpXPolygon;
diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index 6d664cd35468..2c531c777e0b 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -24,7 +24,6 @@
#include <memory>
#include <rtl/string.hxx>
-#define ZCODEC_NO_COMPRESSION 0
#define ZCODEC_DEFAULT_COMPRESSION 6
class SvStream;
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 63dc4b92b90d..d0a8355df96f 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -130,17 +130,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
CppunitTest_sc_spreadsheet_functions_test \
CppunitTest_sc_statistical_functions_test \
CppunitTest_sc_text_functions_test \
-))
-endif
-
-$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
- JunitTest_sc_complex \
- JunitTest_sc_unoapi_1 \
- JunitTest_sc_unoapi_2 \
- JunitTest_sc_unoapi_3 \
- JunitTest_sc_unoapi_4 \
- JunitTest_sc_unoapi_6 \
- JunitTest_sc_unoapi_7 \
CppunitTest_sc_annotationobj \
CppunitTest_sc_annotationshapeobj \
CppunitTest_sc_annotationsobj \
@@ -217,8 +206,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_modelobj \
CppunitTest_sc_namedrangeobj \
CppunitTest_sc_namedrangesobj \
- CppunitTest_sc_opencl-1 \
- CppunitTest_sc_opencl-2 \
CppunitTest_sc_outlineobj \
CppunitTest_sc_recentfunctionsobj \
CppunitTest_sc_recordchanges \
@@ -250,6 +237,19 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_uniquecellformatsobj \
CppunitTest_sc_viewpaneobj \
))
+endif
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
+ JunitTest_sc_complex \
+ JunitTest_sc_unoapi_1 \
+ JunitTest_sc_unoapi_2 \
+ JunitTest_sc_unoapi_3 \
+ JunitTest_sc_unoapi_4 \
+ JunitTest_sc_unoapi_6 \
+ JunitTest_sc_unoapi_7 \
+ CppunitTest_sc_opencl-1 \
+ CppunitTest_sc_opencl-2 \
+))
$(eval $(call gb_Module_add_perfcheck_targets,sc,\
CppunitTest_sc_perfobj \
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 60bfa8415fa2..45d015ef9089 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -32,11 +32,6 @@
#include <srchdlg.hxx>
-// context menu ids
-#define MID_OPEN 1
-#define MID_RENAME 2
-#define MID_DELETE 3
-
namespace com::sun::star::awt { class XWindow; }
namespace com::sun::star::i18n { class XBreakIterator; }
namespace com::sun::star::text { class XTextRange; }
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index acf0b6885028..f5ec2423d821 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1676,7 +1676,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr, bool addPageMargin
// for TiledRendering the default which is set at the start of
// this method to RectPoint::MM seems purposely being changed to
// RectPoint::LT here - from a change 6 years ago. Note that this
- // will make chosing another definition point in the UI for the
+ // will make choosing another definition point in the UI for the
// PosSizeDialog except TopLeft not working when
// comphelper::LibreOfficeKit *is* active.
eSizePoint = RectPoint::LT;
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 57e066669db7..e75bb001df08 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -697,16 +697,12 @@ void SwTableShell::Execute(SfxRequest &rReq)
aBoxSet( *pCoreSet->GetPool() );
rSh.GetTableBoxFormulaAttrs( aBoxSet );
- SfxItemState eState = aBoxSet.GetItemState(RES_BOXATR_FORMAT);
- if(eState == SfxItemState::DEFAULT)
- {
- pCoreSet->Put( SfxUInt32Item( SID_ATTR_NUMBERFORMAT_VALUE,
- pFormatter->GetFormatIndex(NF_TEXT, LANGUAGE_SYSTEM)));
- }
- else
- pCoreSet->Put( SfxUInt32Item( SID_ATTR_NUMBERFORMAT_VALUE,
- aBoxSet.Get(
- RES_BOXATR_FORMAT ).GetValue() ));
+ // tdf#132111: if RES_BOXATR_FORMAT state is DEFAULT (no number format set to cell
+ // explicitly), it's not equal to any specific format (the rules are special, e.g.
+ // it's considered numeric for empty or number text in SwTableBox::HasNumContent).
+ // For multiselection, it's INVALID, also not equal to any single format.
+ if (auto pFormat = aBoxSet.GetItemIfSet(RES_BOXATR_FORMAT))
+ pCoreSet->Put(SfxUInt32Item(SID_ATTR_NUMBERFORMAT_VALUE, pFormat->GetValue()));
pCoreSet->Put( SvxNumberInfoItem( pFormatter,
aBoxSet.Get(
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 01eb735e2aa3..0c357d1d77d0 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2631,7 +2631,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
}
else if (aItem3.first == "AutoloadURL")
{
- // Warning: wrong data here, can froze LO.
+ // Warning: wrong data here, can freeze LO.
xDocProps->setAutoloadURL(
OStringToOUString(aItem3.second.get_value<std::string>(),
RTL_TEXTENCODING_UTF8));
diff --git a/sw/source/uibase/uno/loktxdoc.cxx b/sw/source/uibase/uno/loktxdoc.cxx
index 20f7cd9367ba..6a2431b2dec3 100644
--- a/sw/source/uibase/uno/loktxdoc.cxx
+++ b/sw/source/uibase/uno/loktxdoc.cxx
@@ -729,7 +729,7 @@ void GetDocStructureDocProps(tools::JsonWriter& rJsonWriter, SwDocShell* pDocShe
auto aDocumentStatisticsNode = rJsonWriter.startNode("DocumentStatistics");
for (int i = 0; i < aDocumentStatistics.getLength(); i++)
{
- // Todo check: do all stast are integer numbers?
+ // Todo check: do all stats are integer numbers?
sal_Int32 nValue = 0;
aDocumentStatistics[i].Value >>= nValue;
std::string aStr(OUStringToOString(aDocumentStatistics[i].Name, RTL_TEXTENCODING_UTF8));
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
index 548036654222..3445503f6377 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -5970,6 +5970,8 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf163913LeftRightMarginEm)
CPPUNIT_TEST_FIXTURE(PdfExportTest2, testFormRoundtrip)
{
+ // Loads and saves a PDF with filled forms. This checks the forms survive the round-trip.
+
// We need to enable PDFium import (and make sure to disable after the test)
bool bResetEnvVar = false;
if (getenv("LO_IMPORT_USE_PDFIUM") == nullptr)
@@ -5982,13 +5984,25 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testFormRoundtrip)
osl_clearEnvironment(u"LO_IMPORT_USE_PDFIUM"_ustr.pData);
});
+ // Need to properly set the PDF export options
+ aMediaDescriptor["FilterName"] <<= OUString("draw_pdf_Export");
+ uno::Sequence<beans::PropertyValue> aFilterData(
+ comphelper::InitPropertySequence({ { "UseTaggedPDF", uno::Any(true) } }));
+ aMediaDescriptor["FilterData"] <<= aFilterData;
+
saveAsPDF(u"FilledUpForm.pdf");
+
+ // Parse the round-tripped document with PDFium
auto pPdfDocument = parsePDFExport();
+ // Should be 1 page
CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount());
std::unique_ptr<vcl::pdf::PDFiumPage> pPage = pPdfDocument->openPage(0);
std::unique_ptr<vcl::pdf::PDFiumPageObject> pPageObject = pPage->getObject(1);
+
+ // 5 annotations means 5 form fields
CPPUNIT_ASSERT_EQUAL(5, pPage->getAnnotationCount());
+ // Check each form
{
std::unique_ptr<vcl::pdf::PDFiumAnnotation> pAnnotation = pPage->getAnnotation(0);
CPPUNIT_ASSERT_EQUAL(vcl::pdf::PDFFormFieldType::CheckBox,
diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx
index 3d364847361a..c97e28177b5d 100644
--- a/vcl/source/window/menufloatingwindow.hxx
+++ b/vcl/source/window/menufloatingwindow.hxx
@@ -24,7 +24,6 @@
#include <vcl/toolkit/floatwin.hxx>
#include <vcl/menu.hxx>
-#define EXTRASPACEY 2
#define GUTTERBORDER 8
/** Class that implements the actual window of the floating menu.
diff --git a/vcl/unx/gtk3_kde5/FPServiceInfo.hxx b/vcl/unx/gtk3_kde5/FPServiceInfo.hxx
index 1fbb8fd276b2..069cae4357bd 100644
--- a/vcl/unx/gtk3_kde5/FPServiceInfo.hxx
+++ b/vcl/unx/gtk3_kde5/FPServiceInfo.hxx
@@ -19,9 +19,6 @@
#pragma once
-// the service names
-#define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.Gtk3KDE5FilePicker"
-
// the implementation names
#define FILE_PICKER_IMPL_NAME "com.sun.star.ui.dialogs.Gtk3KDE5FilePicker"
diff --git a/xmloff/source/transform/TransformerAction.hxx b/xmloff/source/transform/TransformerAction.hxx
index 373e32a90b52..0cc7e0f2f9e8 100644
--- a/xmloff/source/transform/TransformerAction.hxx
+++ b/xmloff/source/transform/TransformerAction.hxx
@@ -20,6 +20,5 @@
#pragma once
#define XML_TACTION_EOT 0x0000
-#define XML_TACTION_END 0xffff
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/nssrenam.h b/xmlsecurity/source/xmlsec/nss/nssrenam.h
index 47280408b790..b3ebc5fbcdca 100644
--- a/xmlsecurity/source/xmlsec/nss/nssrenam.h
+++ b/xmlsecurity/source/xmlsec/nss/nssrenam.h
@@ -35,7 +35,6 @@
#pragma once
#define CERT_NewTempCertificate __CERT_NewTempCertificate
-#define PK11_GetKeyData __PK11_GetKeyData
#define CERT_DecodeDERCertificate __CERT_DecodeDERCertificate
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-12-23 02:46:56 +0000