[Libreoffice-commits] .: 8 commits - offapi/com sw/source udkapi/com
Michael Stahl
mst at kemper.freedesktop.org
Fri Apr 20 03:57:56 PDT 2012
offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl | 2
offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl | 4 -
offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl | 2
offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl | 2
offapi/com/sun/star/deployment/PackageInformationProvider.idl | 4 -
offapi/com/sun/star/deployment/XPackageInformationProvider.idl | 4 -
offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl | 2
offapi/com/sun/star/report/meta/XFormulaParser.idl | 2
offapi/com/sun/star/text/XSimpleText.idl | 2
offapi/com/sun/star/ucb/NumberedSortingInfo.idl | 2
offapi/com/sun/star/xml/dom/XAttr.idl | 2
offapi/com/sun/star/xml/dom/XComment.idl | 2
offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl | 4 -
offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl | 4 -
sw/source/core/layout/paintfrm.cxx | 22 ++++++----
udkapi/com/sun/star/corba/corba.idl | 5 ++
udkapi/com/sun/star/corba/giop/giop.idl | 10 ++--
udkapi/com/sun/star/corba/iiop/iiop.idl | 6 +-
udkapi/com/sun/star/corba/iop/iop.idl | 2
udkapi/com/sun/star/reflection/InvalidTypeNameException.idl | 2
udkapi/com/sun/star/util/logging/LoggerRemote.idl | 4 -
21 files changed, 51 insertions(+), 38 deletions(-)
New commits:
commit 85ef81f318cbec16fff67e49c9b902dfe16cb7b7
Author: Tomas Hlavaty <tom at logand.com>
Date: Fri Apr 20 12:19:58 2012 +0200
idl fix symbol references
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
index e6d81f7..4d116f4 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
@@ -47,7 +47,7 @@ published struct ClipboardEvent: com::sun::star::lang::EventObject
//-------------------------------------------------------------------------
/** The current content of the clipboard.
*/
- XTransferable Contents;
+ com::sun::star::datatransfer::XTransferable Contents;
};
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
index 1b06c65..11c79b3 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
@@ -54,7 +54,7 @@ published interface XClipboard: com::sun::star::uno::XInterface
@see com::sun::star::datatransfer::XTransferable
*/
- XTransferable getContents();
+ com::sun::star::datatransfer::XTransferable getContents();
//-------------------------------------------------------------------------
/** Sets the current contents of the clipboard to the specified
@@ -76,7 +76,7 @@ published interface XClipboard: com::sun::star::uno::XInterface
@see com::sun::star::datatransfer::XTransferable
@see com::sun::star::datatransfer::clipboard::XClipboardOwner
*/
- [oneway] void setContents( [in] XTransferable xTrans, [in] XClipboardOwner xClipboardOwner );
+ [oneway] void setContents( [in] com::sun::star::datatransfer::XTransferable xTrans, [in] XClipboardOwner xClipboardOwner );
//-------------------------------------------------------------------------
/** To get the name of the clipboard instance.
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
index 6e81c20..66a5fe1 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
@@ -59,7 +59,7 @@ published interface XClipboardOwner: com::sun::star::uno::XInterface
@see com::sun::star::datatransfer::clipboard::XClipboard
@see com::sun::star::datatransfer::XTransferable
*/
- [oneway] void lostOwnership( [in] XClipboard xClipboard, [in] XTransferable xTrans );
+ [oneway] void lostOwnership( [in] XClipboard xClipboard, [in] com::sun::star::datatransfer::XTransferable xTrans );
};
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
index 98067e5..4dc018a 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
@@ -55,7 +55,7 @@ published struct DropTargetDragEnterEvent: DropTargetDragEvent
*/
- sequence< DataFlavor > SupportedDataFlavors;
+ sequence< com::sun::star::datatransfer::DataFlavor > SupportedDataFlavors;
};
//=============================================================================
commit dc6e942da0ea37b70cb1e34389e152d20e1213a3
Author: Tomas Hlavaty <tom at logand.com>
Date: Fri Apr 20 12:19:54 2012 +0200
fix idl #include guards
diff --git a/offapi/com/sun/star/deployment/PackageInformationProvider.idl b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
index 965d932..253f77b 100644
--- a/offapi/com/sun/star/deployment/PackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __com_sun_star_deployment_XPackageInformationProvider_idl__
-#define __com_sun_star_deployment_XPackageInformationProvider_idl__
+#ifndef __com_sun_star_deployment_PackageInformationProvider_idl__
+#define __com_sun_star_deployment_PackageInformationProvider_idl__
#include <com/sun/star/deployment/XPackageInformationProvider.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
index ef36928..a521bbc 100644
--- a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef __com_sun_star_deployment_XPackageInformationProvide_idl__
-#define __com_sun_star_deployment_XPackageInformationProvide_idl_
+#ifndef __com_sun_star_deployment_XPackageInformationProvider_idl__
+#define __com_sun_star_deployment_XPackageInformationProvider_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl b/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl
index 7de37fa..f7efe8b 100644
--- a/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl
+++ b/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#ifndef __com_sun_star_i18n_XExtendedInputCSequencehecker_idl__
+#ifndef __com_sun_star_i18n_XExtendedInputSequenceChecker_idl__
#define __com_sun_star_i18n_XExtendedInputSequenceChecker_idl__
#include <com/sun/star/i18n/XInputSequenceChecker.idl>
diff --git a/offapi/com/sun/star/text/XSimpleText.idl b/offapi/com/sun/star/text/XSimpleText.idl
index d9ca15c..ef08c69 100644
--- a/offapi/com/sun/star/text/XSimpleText.idl
+++ b/offapi/com/sun/star/text/XSimpleText.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
#ifndef __com_sun_star_text_XSimpleText_idl__
-#define __com_sun_star_text_XSimplText_idl__
+#define __com_sun_star_text_XSimpleText_idl__
#include <com/sun/star/text/XTextRange.idl>
diff --git a/offapi/com/sun/star/ucb/NumberedSortingInfo.idl b/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
index ba3f18f..34ee5b5 100644
--- a/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
+++ b/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
-#define __com_sun_star_ucb_NumberedSortingInfo_idl_
+#define __com_sun_star_ucb_NumberedSortingInfo_idl__
//=============================================================================
diff --git a/offapi/com/sun/star/xml/dom/XAttr.idl b/offapi/com/sun/star/xml/dom/XAttr.idl
index 15a3afe..32e98bc 100644
--- a/offapi/com/sun/star/xml/dom/XAttr.idl
+++ b/offapi/com/sun/star/xml/dom/XAttr.idl
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef __com_sun_star_xml_dom_XAttr_idl__
-#define __com_sun_star_xml_sax_XAttr_idl__
+#define __com_sun_star_xml_dom_XAttr_idl__
#include <com/sun/star/xml/dom/XNode.idl>
diff --git a/offapi/com/sun/star/xml/dom/XComment.idl b/offapi/com/sun/star/xml/dom/XComment.idl
index 3c9d5df..96da7f8 100644
--- a/offapi/com/sun/star/xml/dom/XComment.idl
+++ b/offapi/com/sun/star/xml/dom/XComment.idl
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef __com_sun_star_xml_dom_XComment_idl__
-#define __com_sun_star_xml_dom_XCComment_idl__
+#define __com_sun_star_xml_dom_XComment_idl__
#include <com/sun/star/xml/dom/XCharacterData.idl>
diff --git a/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl b/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl
index e368be1..e95c10d 100644
--- a/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl
+++ b/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef __com_sun_star_xml__xpath_Libxml2ExtensionHandle_idl__
-#define __com_sun_star_xml_Libxml2ExtensionHandle_idl__
+#ifndef __com_sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
+#define __com_sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
index fb2fb17..2ede2d2 100644
--- a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
+++ b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#ifndef __com_sun_star_reflection_InvaildTypeNameException_idl__
+#ifndef __com_sun_star_reflection_InvalidTypeNameException_idl__
#define __com_sun_star_reflection_InvalidTypeNameException_idl__
#include <com/sun/star/uno/Exception.idl>
commit 5040115c9825e70161c52ff21ef45ff403cbde46
Author: Tomas Hlavaty <tom at logand.com>
Date: Wed Jan 25 01:46:32 2012 +0100
idl #ifndef fix
diff --git a/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl b/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
index c5d2bd8..27aec53 100644
--- a/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
+++ b/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef __com_sun_star_xsd_XDataType_idl__
-#define __com_sun_star_xsd_XDataType_idl__
+#ifndef __com_sun_star_xsd_WhiteSpaceTreatment_idl__
+#define __com_sun_star_xsd_WhiteSpaceTreatment_idl__
//=============================================================================
module com { module sun { module star { module xsd {
commit 940be4690893674042cb945820b25052b35b069d
Author: Tomas Hlavaty <tom at logand.com>
Date: Tue Jan 24 09:45:16 2012 +0100
idl fix package for CorbaString8 and CorbaUnion
diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
index 1a8da38..a5b71fd 100644
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ b/udkapi/com/sun/star/corba/giop/giop.idl
@@ -96,7 +96,7 @@ published struct RequestHeader_1_0
unsigned long request_id;
boolean response_expected;
sequence < byte > object_key;
- CorbaString8 operation;
+ com::sun::star::corba::CorbaString8 operation;
sequence < byte > requesting_principal;
};
@@ -112,7 +112,7 @@ published struct RequestHeader_1_1
byte reserved_2;
byte reserved_3; // Added in GIOP 1.1
sequence <byte> object_key;
- CorbaString8 operation;
+ com::sun::star::corba::CorbaString8 operation;
sequence <byte> requesting_principal; // binary compatible
};
@@ -138,7 +138,7 @@ published constants TargetAddressGroup
/**
@deprecated
*/
-published struct TargetAddress : CorbaUnion
+published struct TargetAddress : com::sun::star::corba::CorbaUnion
{
short nDiscriminator;
sequence < byte > object_key; // KeyAddr
@@ -158,7 +158,7 @@ published struct RequestHeader_1_2
byte reserved_2;
byte reserved_3;
TargetAddress target;
- CorbaString8 operation;
+ com::sun::star::corba::CorbaString8 operation;
// Principal not in GIOP 1.2
com::sun::star::corba::iop::ServiceContextList service_context; // 1.2 change
};
@@ -193,7 +193,7 @@ published struct ReplyHeader_1_2
*/
published struct SystemExceptionReplyBody
{
- CorbaString8 exception_id;
+ com::sun::star::corba::CorbaString8 exception_id;
unsigned long minor_code_value;
unsigned long completion_status;
};
diff --git a/udkapi/com/sun/star/corba/iiop/iiop.idl b/udkapi/com/sun/star/corba/iiop/iiop.idl
index aa4becf..a6052bc 100644
--- a/udkapi/com/sun/star/corba/iiop/iiop.idl
+++ b/udkapi/com/sun/star/corba/iiop/iiop.idl
@@ -47,7 +47,7 @@ published struct Version
published struct ProfileBody_1_0
{// renamed from ProfileBody
Version iiop_version;
- CorbaString8 host;
+ com::sun::star::corba::CorbaString8 host;
unsigned short port;
sequence <byte> object_key;
};
@@ -58,7 +58,7 @@ published struct ProfileBody_1_0
published struct ProfileBody_1_1
{// also used for 1.2
Version iiop_version;
- CorbaString8 host;
+ com::sun::star::corba::CorbaString8 host;
unsigned short port;
sequence < byte > object_key;
// Added in 1.1 unchanged for 1.2
@@ -70,7 +70,7 @@ published struct ProfileBody_1_1
*/
published struct ListenPoint
{
- CorbaString8 host;
+ com::sun::star::corba::CorbaString8 host;
unsigned short port;
};
diff --git a/udkapi/com/sun/star/corba/iop/iop.idl b/udkapi/com/sun/star/corba/iop/iop.idl
index b748c05..2d6a7fa 100644
--- a/udkapi/com/sun/star/corba/iop/iop.idl
+++ b/udkapi/com/sun/star/corba/iop/iop.idl
@@ -62,7 +62,7 @@ module com { module sun { module star { module corba { module iop
*/
published struct IOR
{
- CorbaString8 type_id;
+ com::sun::star::corba::CorbaString8 type_id;
sequence <TaggedProfile> profiles;
};
commit a7f3ca4c5bf3aa1ad28a701bf6d0bea71a107f53
Author: Tomas Hlavaty <tom at logand.com>
Date: Sun Jan 22 18:05:20 2012 +0100
add missing #ifndef
diff --git a/udkapi/com/sun/star/corba/corba.idl b/udkapi/com/sun/star/corba/corba.idl
index 45c239a..8f5d62b 100644
--- a/udkapi/com/sun/star/corba/corba.idl
+++ b/udkapi/com/sun/star/corba/corba.idl
@@ -25,6 +25,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+#ifndef __com_sun_star_corba_corba_idl__
+#define __com_sun_star_corba_corba_idl__
+
module com { module sun { module star { module corba
{
/**
@@ -103,4 +106,6 @@ module com { module sun { module star { module corba
}; }; }; };
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7dbbb51f78f7a6f25a288739f9294576c399237b
Author: Tomas Hlavaty <tom at logand.com>
Date: Mon Jan 16 19:55:42 2012 +0100
idl type reference fixed
diff --git a/offapi/com/sun/star/report/meta/XFormulaParser.idl b/offapi/com/sun/star/report/meta/XFormulaParser.idl
index bc7575b..665f307 100644
--- a/offapi/com/sun/star/report/meta/XFormulaParser.idl
+++ b/offapi/com/sun/star/report/meta/XFormulaParser.idl
@@ -55,7 +55,7 @@ interface XFormulaParser
Names and symbols not defined here lead to a parser/print error.
*/
- [attribute] sequence< sheet::FormulaOpCodeMapEntry > OpCodeMap;
+ [attribute] sequence< com::sun::star::sheet::FormulaOpCodeMapEntry > OpCodeMap;
/** return the mapper for op codes.
*/
commit ec24cfbfb98bc610688e2118d16da51a78427dfd
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Apr 20 12:12:14 2012 +0200
LoggerRemote.idl: include with full path
diff --git a/udkapi/com/sun/star/util/logging/LoggerRemote.idl b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
index 83c1f98..0a6fcee 100644
--- a/udkapi/com/sun/star/util/logging/LoggerRemote.idl
+++ b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
@@ -30,8 +30,8 @@
#define __com_sun_star_webtop_Logger_idl__
#include <com/sun/star/uno/XInterface.idl>
-#include <XLogger.idl>
-#include <XLoggerRemote.idl>
+#include <com/sun/star/util/logging/XLogger.idl>
+#include <com/sun/star/util/logging/XLoggerRemote.idl>
//=============================================================================
commit 33ee840e7b45eb971feef83215841edc0ba66cd7
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 19 23:30:13 2012 +0200
fix STL conversion e94c4ab5523c7dcbee2f1b7fd47685529498e774 harder
looping vector iterators and push_back/erase don't mix well
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 03e9731..5ef023d 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -643,9 +643,9 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
SvPtrarr aCheck( 64 );
- for (SwLineRects::iterator it = this->begin(); it != this->end(); ++it)
+ for (size_t i = 0; i < this->size(); )
{
- SwLineRect &rL1 = (*it);
+ SwLineRect &rL1 = (*this)[i];
if ( !rL1.GetTab() || rL1.IsPainted() || rL1.IsLocked() )
continue;
@@ -737,6 +737,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
rL1.GetTab(), SUBCOL_TAB ) );
if ( isFull() )
{
+ --i;
k = aCheck.Count();
break;
}
@@ -776,6 +777,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
rL1.GetTab(), SUBCOL_TAB ) );
if ( isFull() )
{
+ --i;
k = aCheck.Count();
break;
}
@@ -790,7 +792,11 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
}
if ( bRemove )
{
- this->erase( it );
+ this->erase(this->begin() + i);
+ }
+ else
+ {
+ ++i;
}
}
}
@@ -806,11 +812,11 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
// All help lines that are covered by any border will be removed or split
- for (SwSubsRects::iterator it = this->begin(); it != this->end(); ++it)
+ for (size_t i = 0; i < this->size(); ++i)
{
// get a copy instead of a reference, because an <insert> may destroy
// the object due to a necessary array resize.
- const SwLineRect aSubsLineRect = SwLineRect(*it);
+ const SwLineRect aSubsLineRect = SwLineRect((*this)[i]);
// add condition <aSubsLineRect.IsLocked()> in order to consider only
// border lines, which are *not* locked.
@@ -865,7 +871,8 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
this->push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
aSubsLineRect.GetSubColor() ) );
}
- this->erase(it);
+ this->erase(this->begin() + i);
+ --i;
break;
}
}
@@ -890,7 +897,8 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
this->push_back( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
aSubsLineRect.GetSubColor() ) );
}
- this->erase(it);
+ this->erase(this->begin() + i);
+ --i;
break;
}
}
More information about the Libreoffice-commits
mailing list