summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-11-30 19:26:16 (GMT)
committerMichael Stahl <mstahl@redhat.com>2012-11-30 19:26:16 (GMT)
commitaab4574d4b0b055385be8d9b2a752863ba8a1a64 (patch)
tree43f23440ef2661fcc4aafe6fa7a479afdcc21828
parent4323fd8b7a766ab197a1f9a38594cacc51f4d017 (diff)
API CHANGE: remove service com.sun.star.text.PrintPreviewSettings
This service was obsoleted by CWS printerpullpages: the implementation in Writer was defunct in OpenOffice.org 3.3 and completely removed in OpenOffice.org 3.4. Change-Id: Ia4dd6f1f1d8fc399583032b44d99663532409b5c EXISTENCE: published key "/UCR/com/sun/star/text/PrintPreviewSettings" exists only in registry 1 SERVICE: /UCR/com/sun/star/text/DocumentSettings service1 contains 1 more references as service2 incompatible change: Reference 2 ('PrintPreviewSettings') in 'r1' is not longer a reference of this service in 'r2'
-rw-r--r--offapi/UnoApi_offapi.mk1
-rw-r--r--offapi/com/sun/star/text/DocumentSettings.idl3
-rw-r--r--offapi/com/sun/star/text/PrintPreviewSettings.idl71
-rw-r--r--offapi/type_reference/types.rdbbin7458816 -> 7453696 bytes
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/sw/com.sun.star.comp.Writer.DocumentSettings.csv9
-rw-r--r--qadevOOo/tests/java/ifc/text/_PrintPreviewSettings.java26
-rw-r--r--sw/qa/unoapi/knownissues.xcl3
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx3
9 files changed, 1 insertions, 116 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index d156531..a16febe 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1265,7 +1265,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
PagePrintSettings \
Paragraph \
ParagraphEnumeration \
- PrintPreviewSettings \
PrintSettings \
RedlinePortion \
ReferenceMark \
diff --git a/offapi/com/sun/star/text/DocumentSettings.idl b/offapi/com/sun/star/text/DocumentSettings.idl
index 3823973..0ba7929 100644
--- a/offapi/com/sun/star/text/DocumentSettings.idl
+++ b/offapi/com/sun/star/text/DocumentSettings.idl
@@ -22,7 +22,6 @@
#include <com/sun/star/beans/XPropertySet.idl>
#include <com/sun/star/document/Settings.idl>
#include <com/sun/star/text/PrintSettings.idl>
-#include <com/sun/star/text/PrintPreviewSettings.idl>
module com { module sun { module star { module text {
@@ -36,8 +35,6 @@ published service DocumentSettings
[optional] service com::sun::star::text::PrintSettings;
- [optional] service com::sun::star::text::PrintPreviewSettings;
-
/** gives access to the properties implemented by this service.
*/
interface com::sun::star::beans::XPropertySet;
diff --git a/offapi/com/sun/star/text/PrintPreviewSettings.idl b/offapi/com/sun/star/text/PrintPreviewSettings.idl
deleted file mode 100644
index cd3ebe3..0000000
--- a/offapi/com/sun/star/text/PrintPreviewSettings.idl
+++ /dev/null
@@ -1,71 +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 .
- */
-#ifndef __com_sun_star_text_PrintPreviewSettings_idl__
-#define __com_sun_star_text_PrintPreviewSettings_idl__
-
-#include <com/sun/star/text/NotePrintMode.idl>
-
-
-
- module com { module sun { module star { module text {
-
-
-/** These properties describe the printing of the content of a text document.
- *
- * @deprecated since OOo 3.3
- */
-published service PrintPreviewSettings
-{
- /** All properties have the property attribute "maybevoid"
- meaning: if none of them have been set, they all will return a void value, if any
- one of them has been set, then none of them will be void any longer */
-
- /** Size of the left margin */
- [property, maybevoid] long PreviewPrintLeftMargin;
-
- /** Size of the right margin */
- [property, maybevoid] long PreviewPrintRightMargin;
-
- /** Size of the top margin */
- [property, maybevoid] long PreviewPrintTopMargin;
-
- /** Size of the bottom margin */
- [property, maybevoid] long PreviewPrintBottomMargin;
-
- /** Size of the horizontal spacing */
- [property, maybevoid] long PreviewPrintHorizontalSpacing;
-
- [property, maybevoid] long PreviewPrintVerticalSpacing;
-
- /** Number of Rows */
- [property, maybevoid] byte PreviewPrintNumRows;
-
- /** Number of Columns */
- [property, maybevoid] byte PreviewPrintNumColumns;
-
- /** If the format is landscape (if false then the format is portrait */
- [property, maybevoid] boolean PreviewPrintLandscape;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 86a4ced..ab70f67 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 9da1f31..41df7b0 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -824,7 +824,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/text/_MailMerge \
qadevOOo/tests/java/ifc/text/_NumberingLevel \
qadevOOo/tests/java/ifc/text/_NumberingRules \
- qadevOOo/tests/java/ifc/text/_PrintPreviewSettings \
qadevOOo/tests/java/ifc/text/_PrintSettings \
qadevOOo/tests/java/ifc/text/_Text \
qadevOOo/tests/java/ifc/text/_TextColumns \
diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.Writer.DocumentSettings.csv b/qadevOOo/objdsc/sw/com.sun.star.comp.Writer.DocumentSettings.csv
index 5edc3bc..8ff54f7 100644
--- a/qadevOOo/objdsc/sw/com.sun.star.comp.Writer.DocumentSettings.csv
+++ b/qadevOOo/objdsc/sw/com.sun.star.comp.Writer.DocumentSettings.csv
@@ -47,15 +47,6 @@
"DocumentSettings";"com::sun::star::text::PrintSettings";"PrintProspect"
"DocumentSettings";"com::sun::star::text::PrintSettings";"PrintPageBackground"
"DocumentSettings";"com::sun::star::text::PrintSettings";"PrintBlackFonts"
-"DocumentSettings";"com::sun::star::text::PrintPreviewSettings";"PreviewPrintLeftMargin"
-"DocumentSettings";"com::sun::star::text::PrintPreviewSettings";"PreviewPrintRightMargin"
-"DocumentSettings";"com::sun::star::text::PrintPreviewSettings";"PreviewPrintTopMargin"
-"DocumentSettings";"com::sun::star::text::PrintPreviewSettings";"PreviewPrintBottomMargin"
-"DocumentSettings";"com::sun::star::text::PrintPreviewSettings";"PreviewPrintHorizontalSpacing"
-"DocumentSettings";"com::sun::star::text::PrintPreviewSettings";"PreviewPrintVerticalSpacing"
-"DocumentSettings";"com::sun::star::text::PrintPreviewSettings";"PreviewPrintNumRows"
-"DocumentSettings";"com::sun::star::text::PrintPreviewSettings";"PreviewPrintNumColumns"
-"DocumentSettings";"com::sun::star::text::PrintPreviewSettings";"PreviewPrintLandscape"
"DocumentSettings";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"DocumentSettings";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"DocumentSettings";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/qadevOOo/tests/java/ifc/text/_PrintPreviewSettings.java b/qadevOOo/tests/java/ifc/text/_PrintPreviewSettings.java
deleted file mode 100644
index 2ff2763..0000000
--- a/qadevOOo/tests/java/ifc/text/_PrintPreviewSettings.java
+++ /dev/null
@@ -1,26 +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 .
- */
-
-package ifc.text;
-
-import lib.MultiPropertyTest;
-
-public class _PrintPreviewSettings extends MultiPropertyTest
-{
-
-}
diff --git a/sw/qa/unoapi/knownissues.xcl b/sw/qa/unoapi/knownissues.xcl
index c2c131b..e3f122d 100644
--- a/sw/qa/unoapi/knownissues.xcl
+++ b/sw/qa/unoapi/knownissues.xcl
@@ -113,9 +113,6 @@ sw.SwXFieldMaster::com::sun::star::text::TextFieldMaster
sw.SwAccessibleTableView
# -> disabled in sw.sce
-### i85635 ###
-sw.DocumentSettings::com::sun::star::text::PrintPreviewSettings
-
### i85638 ###
sw.SwXTextDocument::com::sun::star::frame::XStorable
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index d5167a5..ede40fd 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -1228,11 +1228,10 @@ sal_Bool SAL_CALL SwXDocumentSettings::supportsService( const OUString& ServiceN
Sequence< OUString > SAL_CALL SwXDocumentSettings::getSupportedServiceNames( )
throw(RuntimeException)
{
- Sequence< OUString > aSeq( 4 );
+ Sequence< OUString > aSeq( 3 );
aSeq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.Settings") );
aSeq[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.DocumentSettings") );
aSeq[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.PrintSettings") );
- aSeq[3] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.PrintPreviewSettings") );
return aSeq;
}