[ooo-build-commit] Branch 'ooo/master' - 2 commits - basctl/source package/inc package/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Jul 2 17:19:48 PDT 2009


 basctl/source/dlged/dlgedobj.cxx              |   74 --------------------------
 basctl/source/dlged/dlgedview.cxx             |   66 +++++++++++++++++++++++
 basctl/source/inc/dlgedobj.hxx                |    3 -
 basctl/source/inc/dlgedview.hxx               |    5 +
 package/inc/ImplValidCharacters.hxx           |   60 ---------------------
 package/source/zipapi/ZipOutputStream.cxx     |    2 
 package/source/zippackage/ZipPackageEntry.cxx |    4 -
 7 files changed, 72 insertions(+), 142 deletions(-)

New commits:
commit 440640a588124f76cf98b8fcb6d8bc1cba9e4208
Author: Release Engineers <releng at openoffice.org>
Date:   Thu Jul 2 14:28:15 2009 +0000

    CWS-TOOLING: integrate CWS aw065
    2009-06-17 13:48:12 +0200 aw  r273068 : #99385# corrected small error in SCs selection visualisation
    2009-06-16 15:45:28 +0200 wg  r273021 : i102838
    2009-06-16 12:46:07 +0200 wg  r273016 : i102833
    2009-06-11 17:40:29 +0200 aw  r272895 : #i98870# added implementation for getPageCount helper
    2009-06-11 16:39:54 +0200 aw  r272885 : #i102663#, #i102667#, #i98870# incluide file typo corrected
    2009-06-11 16:24:07 +0200 aw  r272881 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added
    2009-06-11 16:23:52 +0200 aw  r272880 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added
    2009-06-09 13:50:29 +0200 aw  r272769 : #i98917# added support for the OverlayHatchRectanglePrimitive to follow rotation with it's hatch; simplified OverlayHatchRect
    2009-06-09 13:04:06 +0200 aw  r272766 : #i98870# re-added PageNumber identification in SdrTextPrimitive2D::get2DDecomposition
    2009-06-08 18:56:05 +0200 aw  r272744 : #i99385# added some last corrections to OverlayObjects in SD (had to do some merges on resync, needed to optically check and correct)
    2009-06-08 11:17:57 +0200 aw  r272725 : cws aw065: corrections after resync
    2009-06-08 11:02:25 +0200 aw  r272723 : cws aw065: corrections after resync
    2009-06-08 10:36:22 +0200 aw  r272722 : cws aw065: corrections after resync
    2009-06-05 18:57:06 +0200 aw  r272712 : CWS-TOOLING: rebase CWS aw065 to trunk at 272291 (milestone: DEV300:m49)
    2009-06-05 14:56:34 +0200 aw  r272690 : #i89784# stripped old stuff no longer needed due to text-to-polygon conversion using primitives
    2009-06-05 14:50:07 +0200 aw  r272688 : #102091# removed on-model-lock suppression for SdrObject::ActionChanged()
    2009-06-05 14:47:29 +0200 aw  r272687 : #102091# corrected local value buffering in ScenePrimitive2D::get2DDecomposition
    2009-06-03 17:53:32 +0200 aw  r272599 : #i89784# version before stripping
    2009-06-03 17:52:18 +0200 aw  r272598 : #i89784# version before stripping
    2009-05-28 17:15:47 +0200 aw  r272420 : #i101872# old stuff removed/stripped
    2009-05-28 17:15:32 +0200 aw  r272419 : #i101872# old stuff removed/stripped
    2009-05-28 17:15:15 +0200 aw  r272418 : #i101872# old stuff removed/stripped
    2009-05-28 17:14:45 +0200 aw  r272417 : #i101872# old stuff removed/stripped
    2009-05-28 12:13:56 +0200 aw  r272396 : #i101872# stable hybrid state
    2009-05-28 12:13:46 +0200 aw  r272395 : #i101872# stable hybrid state
    2009-05-28 12:13:35 +0200 aw  r272394 : #i101872# stable hybrid state
    2009-05-28 12:13:20 +0200 aw  r272393 : #i101872# stable hybrid state
    2009-05-28 12:13:05 +0200 aw  r272392 : #i101872# stable hybrid state
    2009-05-28 12:12:51 +0200 aw  r272391 : #i101872# stable hybrid state
    2009-05-15 16:56:02 +0200 aw  r271952 : #i101872# HitTest unifications
    2009-05-15 16:55:22 +0200 aw  r271951 : #i101872# HitTest unifications
    2009-05-15 16:55:12 +0200 aw  r271950 : #i101872# HitTest unifications
    2009-05-15 16:55:01 +0200 aw  r271949 : #i101872# HitTest unifications
    2009-05-15 16:54:51 +0200 aw  r271948 : #i101872# HitTest unifications
    2009-05-15 16:54:35 +0200 aw  r271947 : #i101872# HitTest unifications
    2009-05-15 16:54:22 +0200 aw  r271946 : #i101872# HitTest unifications
    2009-05-12 19:08:38 +0200 aw  r271834 : #i101684# corrected AutoShape's preparation of text transformation due to different definitions in TextBounds
    2009-05-12 15:44:49 +0200 aw  r271827 : #i89784# expanded TextLayouterDevice::getTextOutlines() to support DXArray and X-Font scaling
    2009-05-11 19:40:40 +0200 aw  r271790 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
    2009-05-11 19:40:25 +0200 aw  r271789 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
    2009-05-11 19:40:12 +0200 aw  r271788 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
    2009-05-11 13:01:53 +0200 aw  r271765 : #i99385# corrections and optimizations
    2009-05-08 14:48:40 +0200 aw  r271718 : #i1016180# added optimizations in model operations when model is locked
    2009-05-08 14:11:45 +0200 aw  r271716 : #i101679# added flush() calls to OverlayManager when interaction step is prepared
    2009-05-07 17:44:03 +0200 aw  r271689 : #i99385# last corrections/changes
    2009-05-07 17:43:47 +0200 aw  r271688 : #i99385# last corrections/changes
    2009-05-07 13:20:09 +0200 aw  r271654 : #i99385# added changes from WFH
    2009-05-07 13:19:38 +0200 aw  r271653 : #i99385# added changes from WFH
    2009-05-07 13:19:11 +0200 aw  r271652 : #i99385# added changes from WFH
    2009-05-07 11:33:17 +0200 aw  r271643 : #i99385# corrections after resync
    2009-05-07 11:17:31 +0200 aw  r271642 : #i99385# corrections after resync
    2009-05-06 18:46:53 +0200 aw  r271609 : CWS-TOOLING: rebase CWS aw065 to trunk at 271427 (milestone: DEV300:m47)
    2009-05-05 18:24:03 +0200 aw  r271548 : #i101443# force new text decomposition when TextBackgroundColor has changed
    2009-05-05 17:44:42 +0200 aw  r271542 : #i99385# 3rd round, simplifications and corrections done
    2009-05-05 17:44:32 +0200 aw  r271541 : #i99385# 3rd round, simplifications and corrections done
    2009-05-05 17:44:20 +0200 aw  r271540 : #i99385# 3rd round, simplifications and corrections done
    2009-05-05 17:44:09 +0200 aw  r271539 : #i99385# 3rd round, simplifications and corrections done
    2009-05-05 15:48:38 +0200 aw  r271527 : #i99385# 2nd round, usages checked and corrected
    2009-05-05 15:48:15 +0200 aw  r271526 : #i99385# 2nd round, usages checked and corrected
    2009-05-05 15:48:03 +0200 aw  r271525 : #i99385# 2nd round, usages checked and corrected
    2009-05-05 15:47:51 +0200 aw  r271524 : #i99385# 2nd round, usages checked and corrected
    2009-04-27 18:33:10 +0200 aw  r271300 : #i99385# state commit after all implementations are done
    2009-04-27 15:36:53 +0200 aw  r271283 : #i99385# state commit after all implementations are done
    2009-04-27 15:27:49 +0200 aw  r271280 : #i99385# state commit after all implementations are done
    2009-04-27 15:27:33 +0200 aw  r271279 : #i99385# state commit after all implementations are done
    2009-04-27 15:27:00 +0200 aw  r271278 : #i99385# state commit after all implementations are done
    2009-04-27 15:26:15 +0200 aw  r271277 : #i99385# state commit after all implementations are done
    2009-04-27 15:25:40 +0200 aw  r271275 : #i99385# state commit after all implementations are done
    2009-04-27 15:25:19 +0200 aw  r271274 : #i99385# state commit after all implementations are done
    2009-04-27 15:24:00 +0200 aw  r271272 : #i99385# state commit after all implementations are done
    2009-03-19 17:12:00 +0100 aw  r269757 : #i100360# corrected bitmap's PefSize calculation for bitmap filled objects when Bitmap is Pixel-based on it's mapping
    2009-02-19 17:09:47 +0100 aw  r268298 : #i98917# corrected attributes
    2009-02-19 17:09:30 +0100 aw  r268297 : #i98917# corrected attributes
    2009-02-19 17:08:22 +0100 aw  r268296 : #i98917# corrected attributes
    2009-02-19 11:56:25 +0100 aw  r268268 : #i98870# added extra code to react on PageNumber change
    2009-02-18 16:57:24 +0100 aw  r268243 : #i98917# in OverlayHatchRect::getGeometry the rotation was not applied to the TopLeft of the centered rectangle, but to the already extended one, thus the visualisation was rotating around the wrong edge

diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index dd4f21b..663992f 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1377,54 +1377,6 @@ void DlgEdObj::SetLayer(SdrLayerID nLayer)
 
 //----------------------------------------------------------------------------
 
-SdrObject* DlgEdObj::CheckHit( const Point& rPnt, USHORT nTol,const SetOfByte* pSet ) const
-{
-    // #109994# fixed here, because the drawing layer doesn't handle objects
-    // with a width or height of 0 in a proper way
-    Rectangle aRect_( aOutRect );
-    if ( aRect_.IsEmpty() )
-    {
-        aRect_.Left() -= nTol;
-        aRect_.Top() -= nTol;
-        aRect_.Right() = ( aRect_.Right() == RECT_EMPTY ? aOutRect.Left() + nTol : aRect_.Right() + nTol );
-        aRect_.Bottom() = ( aRect_.Bottom() == RECT_EMPTY ? aOutRect.Top() + nTol : aRect_.Bottom() + nTol );
-
-        if ( aRect_.IsInside( rPnt ) )
-            return (SdrObject*)this;
-        else
-            return 0;
-    }
-
-    if ( supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ))
-    {
-        Rectangle aROuter = aOutRect;
-        aROuter.Left()	 -= nTol;
-        aROuter.Right()  += nTol;
-        aROuter.Top()	 -= nTol;
-        aROuter.Bottom() += nTol;
-
-        Rectangle aRInner = aOutRect;
-        if( (aRInner.GetSize().Height() > (long)nTol*2) &&
-            (aRInner.GetSize().Width()	> (long)nTol*2)    )
-        {
-            aRInner.Left()	 += nTol;
-            aRInner.Right()  -= nTol;
-            aRInner.Top()	 += nTol;
-            aRInner.Bottom() -= nTol;
-        }
-
-        if( aROuter.IsInside( rPnt ) && !aRInner.IsInside( rPnt ) )
-            return (SdrObject*)this;
-        else
-            return 0;
-    }
-    else
-        return SdrUnoObj::CheckHit( rPnt, nTol, pSet );
-}
-
-
-//----------------------------------------------------------------------------
-
 TYPEINIT1(DlgEdForm, DlgEdObj);
 DBG_NAME(DlgEdForm);
 
@@ -1857,32 +1809,6 @@ void DlgEdForm::UpdateTabOrderAndGroups()
 
 //----------------------------------------------------------------------------
 
-SdrObject* DlgEdForm::CheckHit( const Point& rPnt, USHORT nTol, const SetOfByte* ) const
-{
-    Rectangle aROuter = aOutRect;
-    aROuter.Left()	 -= nTol;
-    aROuter.Right()  += nTol;
-    aROuter.Top()	 -= nTol;
-    aROuter.Bottom() += nTol;
-
-    Rectangle aRInner = aOutRect;
-    if( (aRInner.GetSize().Height() > (long)nTol*2) &&
-        (aRInner.GetSize().Width()	> (long)nTol*2)    )
-    {
-        aRInner.Left()	 += nTol;
-        aRInner.Right()  -= nTol;
-        aRInner.Top()	 += nTol;
-        aRInner.Bottom() -= nTol;
-    }
-
-    if( aROuter.IsInside( rPnt ) && !aRInner.IsInside( rPnt ) )
-        return (SdrObject*)this;
-    else
-        return 0;
-}
-
-//----------------------------------------------------------------------------
-
 void DlgEdForm::NbcMove( const Size& rSize )
 {
     SdrUnoObj::NbcMove( rSize );
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index 6316b38..2f65709 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -43,6 +43,7 @@
 
 #include <basidesh.hxx>
 #include <iderdll.hxx>
+#include "dlgedobj.hxx"
 
 TYPEINIT1( DlgEdView, SdrView );
 
@@ -151,3 +152,68 @@ void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin )
 
 //----------------------------------------------------------------------------
 
+SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT nTol)
+{
+    DlgEdObj* pDlgEdObj = dynamic_cast< DlgEdObj* >(pRetval);
+
+    if(pDlgEdObj)
+    {
+        bool bExcludeInner(false);
+
+        if(0 != dynamic_cast< DlgEdForm* >(pRetval))
+        {
+            // from DlgEdForm::CheckHit; exclude inner for DlgEdForm
+            bExcludeInner = true;
+        }
+        else if(pDlgEdObj->supportsService("com.sun.star.awt.UnoControlGroupBoxModel"))
+        {
+            // from DlgEdObj::CheckHit; exclude inner for group shapes
+            bExcludeInner = true;
+        }
+
+        if(bExcludeInner)
+        {
+            // use direct model data; it's a DlgEdObj, so GetLastBoundRect()
+            // will access aOutRect directly
+            const Rectangle aOuterRectangle(pDlgEdObj->GetLastBoundRect());
+
+            if(!aOuterRectangle.IsEmpty() 
+                && RECT_EMPTY != aOuterRectangle.Right() 
+                && RECT_EMPTY != aOuterRectangle.Bottom())
+            {
+                basegfx::B2DRange aOuterRange(
+                    aOuterRectangle.Left(), aOuterRectangle.Top(), 
+                    aOuterRectangle.Right(), aOuterRectangle.Bottom());
+
+                if(nTol)
+                {
+                    aOuterRange.grow(-1.0 * nTol);
+                }
+
+                if(aOuterRange.isInside(basegfx::B2DPoint(rPnt.X(), rPnt.Y())))
+                {
+                    pRetval = 0;
+                }
+            }
+        }
+    }
+
+    return pRetval;
+}
+
+SdrObject* DlgEdView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
+{
+    // call parent
+    SdrObject* pRetval = SdrView::CheckSingleSdrObjectHit(rPnt, nTol, pObj, pPV, nOptions, pMVisLay);
+
+    if(pRetval)
+    {
+        // check hitted object locally
+        pRetval = impLocalHitCorrection(pRetval, rPnt, nTol);
+    }
+
+    return pRetval;
+}
+
+//----------------------------------------------------------------------------
+// eof
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index fff37ae..b0b4311 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -140,7 +140,6 @@ public:
     virtual void SAL_CALL _elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
 
     virtual void SetLayer(SdrLayerID nLayer);
-    virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const;
 };
 
 
@@ -194,8 +193,6 @@ public:
     virtual void UpdateGroups();
     virtual void UpdateTabOrderAndGroups();
 
-    virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const;
-
     ::com::sun::star::awt::DeviceInfo getDeviceInfo() const;
 
 private:
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 1b1a439..a8c538c 100644
--- a/basctl/source/inc/dlgedview.hxx
+++ b/basctl/source/inc/dlgedview.hxx
@@ -53,6 +53,11 @@ public:
 
     virtual void MarkListHasChanged();
     virtual void MakeVisible( const Rectangle& rRect, Window& rWin );
+
+protected:
+    // overloaded to handle HitTest for some objects special
+    using SdrView::CheckSingleSdrObjectHit;
+    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const;
 };
 
 #endif //_BASCTL_DLGEDVIEW_HXX
commit 00b207be0ee38a974ea45f472b46e847d1b0979d
Author: Release Engineers <releng at openoffice.org>
Date:   Thu Jul 2 09:05:03 2009 +0000

    CWS-TOOLING: integrate CWS odfmetadata2
    2009-06-22 11:48:36 +0200 mst  r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
      + add "include ustrbuf.hxx" to work around warning caused by
        solaris <sys/kstat.h> declaring a global "long l ;"
    2009-06-19 14:25:25 +0200 mst  r273159 : - scp2/source/ooo/file_library_ooo.scp:
      + fix MinGW build
    2009-06-08 12:52:33 +0200 mst  r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
      + disable parsers that do not build on MinGW (thanks for patch by tono)
    2009-05-15 17:31:07 +0200 mst  r271957 : fix typos
    2009-05-15 17:28:57 +0200 mst  r271956 : #i101965#
    - offapi/com/sun/star/text/TextPortion:
      + add missing properties:
        SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
      + fix read-only status of properties: Bookmark, IsStart, IsCollapsed
    - offapi/type_reference/{typelibrary_history.txt,types.rdb}:
      + update reference types.rdb
    2009-05-07 14:41:38 +0200 mst  r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
      sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
      sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
      sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
      sw/source/ui/fldui/fldref.cxx:
      + fix warning ... the hard way
      + also fix signature of SwDoc::SetCurFtn
    2009-05-05 19:52:55 +0200 mst  r271556 : - sw/inc/undobj.hxx:
      + make some members const
    2009-05-05 19:34:40 +0200 mst  r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
      + make some members const
    2009-05-05 19:13:14 +0200 mst  r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
      sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
      + fix rebase merge error
      + rename SwHstryBookmark to SwHistoryBookmark
      + clean up SwUndoBookmark
    2009-05-05 19:05:53 +0200 mst  r271552 : - sw/source/core/unocore/unoportenum.cxx:
      + fix annoying assertion
    2009-05-05 15:34:48 +0200 mst  r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk at 271427 (milestone: DEV300:m47)
    2009-05-04 12:37:01 +0200 mst  r271444 : trivial
    2009-04-22 13:30:37 +0200 mst  r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
      + trivial change
    2009-04-21 16:46:58 +0200 mst  r271043 : - sw/inc/hintids.hxx:
      + introduce some predicates for the various hints, and use them
    2009-04-21 16:19:03 +0200 mst  r271041 : - sw/inc/undobj.hxx,
      sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
      sw/source/core/undo/{unattr.cxx,unins.cxx}:
      + clean up unattr.cxx:
        remove/fix casts, prefix members, use auto_ptr, etc.
    2009-04-21 15:34:23 +0200 mst  r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
      sw/source/core/doc/docfmt.cxx,
      sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
      sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
        unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
      + clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
        remove/fix casts, prefix members, remove wrong const annotations,
        use auto_ptr, remove unused members, etc.
    2009-04-20 19:17:36 +0200 mst  r271013 : - sw/inc/ndhints.hxx,
      sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
        txtfrm.cxx,txtdrop.cxx,frmform.cxx},
      sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
      sw/source/core/edit/acorrect.cxx,
      sw/source/core/doc/{docedt.cxx,docfmt.cxx},
      sw/source/filter/html/swhtml.cxx:
      + clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
    2009-04-20 18:42:07 +0200 mst  r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
      sw/source/core/undo/rolbck.cxx:
      + remove JP_NEWCORE dead code
    2009-04-20 18:38:09 +0200 mst  r271006 : - sw/source/core/unocore/unochart.cxx:
      + silence unxlngi warning (debug=t)
    2009-04-20 16:36:13 +0200 mst  r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
      sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
      + trivial cleanups
    2009-04-20 15:28:52 +0200 mst  r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
      sfx2/source/doc/objserv.cxx:
      + fix bug: replaying a macro with a DocumentInfoItem removes all
        user-defined properties
    2009-03-10 15:08:20 +0100 mst  r269273 : - sfx2/source/doc/Metadatable.cxx:
      + add missing SolarMutex guards
    2009-03-10 14:46:29 +0100 mst  r269272 : - unoxml/source/rdf/librdf_repository.cxx:
      + never free rdf_world because that would call libxm2 xmlCleanupParser
        (and, to add insult to injury, other libxml2 functions later...)
    2009-03-06 19:02:44 +0100 mst  r269041 : argh! undo...
    2009-03-06 19:00:58 +0100 mst  r269040 : fix #i99931#
    - sw/source/ui/uno/unomod.cxx:
      + SwXViewSettings::_getSingleValue returns uninitialized memory
        for the ZoomType property if the value is PAGE_WIDTH_EXACT
    2009-03-06 18:59:28 +0100 mst  r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
      sw/source/core/unocore/unoportenum.cxx:
      + fix some more wntmsci12 warnings...
    2009-03-06 18:56:46 +0100 mst  r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
      + work around spurious warning on unxsoli4 debug=t
    2009-03-05 14:02:01 +0100 mst  r268902 : - sw/inc/txatbase.hxx:
      + back to c-style casts, they also compile on wntmsci12...
    2009-03-05 10:23:25 +0100 mst  r268882 : - comphelper/inc/comphelper/processfactory.hxx,
      comphelper/source/processfactory/processfactory.cxx:
      + revert change of return type of comphelper_getProcessComponentContext
        to Reference: does not build on wntmsci12
    2009-03-04 19:08:09 +0100 mst  r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
      + fix initialization
    2009-03-04 14:37:30 +0100 mst  r268831 : - solenv/inc/target.mk:
      + fix CLASSPATH so complex tests run (fix by sb)
    2009-03-04 14:36:30 +0100 mst  r268830 : - sw/inc/unoobj.hxx,
      sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
      + SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
      + move SwParaSelection into unoparagraph.cxx, as it is only used there
      + bugfix: replace SwUnoCrsrs on stack with SwCursors
    2009-03-04 14:34:46 +0100 mst  r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
      sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
      sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
      + clean up SwPaM: prefix members
      + new constructor SwPosition(SwCntntNode&, xub_StrLen)
      + fix several broken SwPosition and SwPaM constructors
      + SwPam::DeleteMark now actually resets the unused position to default
    2009-03-02 12:07:09 +0100 mst  r268646 : - sw/inc/fmtcol.hxx:
      + fix annoying warning (gcc 4)
    2009-03-02 12:06:27 +0100 mst  r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
      + rename module from FieldMaster to fieldmaster
    2009-02-27 19:49:56 +0100 mst  r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
      sfx2/source/doc/{Metadatable.cxx,makefile.mk},
      sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
      sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
      sw/source/core/undo/{untbl.cxx,unins.cxx},
      sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
      + move Metadatable implementation from sw to sfx2
    2009-02-27 17:58:55 +0100 mst  r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
      sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
      + CreateUndo now returns an opaque MetadatableUndo object
    2009-02-27 13:15:44 +0100 mst  r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
      sw/source/core/text/{itratr.cxx,porlay.cxx},
      sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
      + clean up SwTxtNode: fix casts, prefix members
      + factor out inline function SwTxtNode::TryDeleteSwpHints()
    2009-02-27 13:14:30 +0100 mst  r268586 : - svx/inc/svx/emphitem.hxx:
      + fix borken header guard
    2009-02-27 13:13:56 +0100 mst  r268585 : - sfx2/source/bastyp/progress.cxx:
      + fix use of compiler specific macro
    2009-02-27 11:00:32 +0100 mst  r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
        txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
      sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
        txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
      sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
      sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
      + clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
      + SwTxtINetFmt: remove unused member bColor
    - sw/source/core/text/txtfld.cxx:
      + move SwTxtFld methods to atrfld.cxx
    2009-02-27 10:58:44 +0100 mst  r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
      + don't privately inherit BaseMutex, ScModelObj wants to access it
    2009-02-27 10:58:02 +0100 mst  r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
      + arrrgh!!! someone thought it would be a good idea to have 2 different
        versions of boost in external! and they're NOT compatible!!!
        insert an ugly fragile hack that maybe works with both...
    2009-02-26 17:42:26 +0100 mst  r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
      sfx2/source/doc/DocumentMetadataAccess.cxx:
      +  someone made IsValidZipEntryFileName a static method and didn't tell me
    2009-02-26 15:52:56 +0100 mst  r268529 : redland: split up patches
    2009-02-26 13:17:56 +0100 mst  r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
    #i95863#
    - sw/inc/segdefs{,_}.hxx:
      + remove obsolete files
    - sw/source/ui/inc/itemdef.hxx:
      + remove itemdef.hxx
    - sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
      sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
      + use sfx2/msg.hxx instead of itemdef.hxx
    - sw/source/core/edit/eddel.cxx:
      + @ JP: SwEditShell::Replace:
        you're right, deleting the text to be replaced first, and then inserting
        a space, and then replacing that space is unnecessary.
        whew, i'm so happy that we finally answered that question after 11 years.
    - sw/inc/edimp.hxx:
      + remove FOREACHCURSOR_START, FOREACHCURSOR_END
    - sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
      sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
        unocrsr.cxx,viscrs.cxx},
      sw/source/core/doc/{docbm.cxx,doccorr.cxx},
      sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
      sw/source/core/edit/editsh.cxx,
      sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
      sw/source/core/layout/trvlfrm.cxx,
      sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
        unoportenum.cxx,unotbl.cxx},
      sw/source/core/view/vprint.cxx:
      + remove the hideous  virtual operator SwFooCursor*
      + make SwCursor::IsReadOnlyAvailable() virtual
      + make SwUnoCrsr::Clone() virtual
      + refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
        replace dynamic_cast<...>(this) with new virtual methods
    2009-02-26 13:14:58 +0100 mst  r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
    - sw/source/filter/xml/swxml.cxx:
      + XMLReader::Read: load RDF metadata of the ODF document
    - sw/source/filter/xml/wrtxml.cxx:
      + SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
    #i90620#: import xml:id in text tables (does not actually work yet)
    - sw/source/filter/xml/xmltbli{.hxx,.cxx}:
      + SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
      + SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl:  attribute xml:id
      + SwXMLTableCellContext_Impl::CreateChildContext:  attribute xml:id
      + SwXMLTableColContext_Impl::SwXMLTableColContext_Impl:  attribute xml:id
      + SwXMLTableContext::SwXMLTableContext:  attribute xml:id
    fix #i98530#
    - sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
      + SwXTextPortion: make constructor params const&
    - sw/source/core/unocore/unoportenum.cxx:
      + refactor to remove some code duplication
      + fix bug: paragraph w/out hints: bookmark before frame gets lost
    #i97274# handle invalid tables
    - sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
      + SwXMLTableContext::MakeTable():
        check that the table actually contains cells,
        and abort (removing the inserted table nodes) if not
    2009-02-26 13:11:48 +0100 mst  r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
    refactor SwXTextRange and SwXParagraph
    - sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
      + remove 3 constructors of SwXTextRange
      + new method SwXTextRange::CreateParentXText
      + refactor SwXTextRange::CreateTextRangeFromPosition and
        SwXTextRange::getText
    - sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
      + SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
      + replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
    - sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
      + adapt to new SwXParagraph
    #i90620#
    - sw/inc/SwMetadatable.hxx,
      sw/source/core/doc/SwMetadatable.cxx:
      + new files: base classes sw::Metadatable and sw::MetadatableMixin;
        also, 2 implementations of IXmlIdRegistry:
        sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
      + setMetadataReference: handle empty stream name as auto-detect
    - sw/source/core/doc/makefile.mk:
      + add SwMetadatable
    add a XmlIdRegistry to SwDoc
    - sw/inc/doc.hxx:
      + SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
    - sw/source/core/doc/docnew.cxx:
      + initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
        because the constructor is not told whether the SwDoc is a clipboard
    - sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
      + SwDocShell: override GetXmlIdRegistry()
    #i91563#: make the SwTxtNode metadatable
    - sw/inc/ndtxt.hxx
      + SwTxtNode inherits sw::Metadatable
    - sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
      + SwXParagraph inherits sw::MetadatableMixin
    #i91563#: handle SwTxtNode's metadata for delete
    - sw/source/core/txtnode/ndtxt.cxx:
      + SwTxtNode::SplitCntntNode: handle XmlId
      + SwTxtNode::JoinNext: merge XmlIds
    - sw/source/core/doc/docedt.cxx:
      + lcl_GetJoinFlags: document postcondition
      + SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
    #i91563#: handle SwTxtNode's metadata for delete with undo
    - sw/inc/undobj.hxx
      + SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
    - sw/source/core/undo/undel.cxx:
      + SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
      + SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
      + SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
    - sw/source/core/docnode/ndcopy.cxx:
      + SwTxtNode::MakeCopy: register copy at XmlIdRegistry
    #i91563#: handle SwTxtNode's metadata for find/replace with undo
    - sw/source/core/undo/unins.cxx:
      + _UnReplaceData: rename members: add prefix m_
      + _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
      + _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
      + _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
    #i91563#: handle SwTxtNode's metadata for table-to-text with undo
    - sw/source/core/undo/untbl.cxx:
      + SwTblToTxtSave: rename members: add prefix m_
      + SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
      + SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
      + SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
        always store the index of the first SwTxtNode in the cell, instead of
        the index of the first SwTxtNode in case of the first cell in a row,
        and the cell start node in other cases
      + SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
    - sw/source/core/docnode/ndtbl.cxx:
      + lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
    2009-02-26 13:02:28 +0100 mst  r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
    - sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
      + remove invocations of SFX_DECL_TYPE
    - sd/source/ui/slideshow/SlideShowRestarter.cxx,
      sd/source/ui/toolpanel/LayoutMenu.cxx,
      sd/source/ui/unoidl/DrawController.cxx,
      sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
      + fix abuses of comphelper_getProcessComponentContext (missing release)
    2009-02-26 13:01:24 +0100 mst  r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
    - starmath/source/document.cxx:
      + don't touch SfxObjectShell's privates
    2009-02-26 13:00:37 +0100 mst  r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
    #i90620#
    - sfx2/inc/sfx2/XmlIdRegistry.hxx:
      + new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
        and a couple of utility functions
    - sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
      sfx2/source/doc/DocumentMetadataAccess.cxx:
      + new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
      + the URI of the DocumentMetadataAccess is now the URI from which the
        document was loaded; for a new document, use a vnd.sun.star.tdoc URI
      + add new function sfx2::createBaseURI()
      + prevent using reserved file names
      + try not to recurse into embedded subdocuments
    - sfx2/source/doc/makefile.mk:
      + add DocumentMetadataAccess
    - sfx2/util/makefile.mk:
      + link libsfx2 against libxml2 (needed for xmlValidateNCName)
    - sfx2/source/doc/makefile.mk:
      + add LIBXML_CFLAGS to CFLAGS
    - sfx2/prj/build.lst:
      + add dependence on libxml2
    - sfx2/prj/d.lst:
      + add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
    - sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
      + make SfxObjectShell's members private
      + new method SfxObjectShell::GetAutoStyleFilterIndex
      + SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
    - sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
      + don't touch SfxObjectShell's privates
    - sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
      + SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
      + SfxBaseModel implements additional interface XDocumentMetadataAccess
      + IMPL_SfxBaseModel_DataContainer has new member:
        a sfx2::DocumentMetadataAccess
      + implementation of XDocumentMetadataAccess forwards to
        the sfx2::DocumentMetadataAccess member
    - sfx2/qa/complex/DocumentMetadataAccessTest.java,
      sfx2/qa/complex/{tests.sce,makefile.mk},
      sfx2/qa/complex/testdocuments/TESTRDFA.odt:
      + add complex test: DocumentMetadataAccessTest
      + add RDFa test document
    #i95863#
    - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
      + refactor SfxDocumentItem so it no longer requires a XDocumentInfo
      + move struct CustomProperty to implementation file
      + remove class SfxDocumentUserPage
      + QueryValue,PutValue: remove MID_DOCINFO_FIELD*
    - sfx2/source/doc/objserv.cxx:
      + adapt to SfxDocumentItem change
    - sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
      + remove MID_DOCINFO_FIELD*
      + put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
    - sfx2/source/doc/objxtor.cxx:
      + fix abuses of comphelper_getProcessComponentContext (missing release)
    - sfx2/source/doc/docfile.cxx:
      + SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
    - sfx2/source/doc/objstor.cxx:
      + SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
    2009-02-26 12:58:07 +0100 mst  r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
    #i90620#: implement RDFa import (interface change)
    - xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
      + make SvXMLImport::GetAbsoluteReference() const
      + add SvXMLImport::GetComponentContext()
      + SvXMLImport::_InitCtor(): add RDFa namespace
      + add SvXMLImport::AddRDFa()
      + SvXMLImport::endDocument() inserts RDFa into document repository
    - xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
      + new tokens for RDFa: XML_ABOUT, XML_DATATYPE
    - xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
      + new class RDFaImportHelper
      + adapt the code to the bleak reality of broken C++ implementations
      + handle empty xhtml:about attributes properly, which are actually
        valid relative URIs
      + work around broken SvXMLImport::GetAbsoluteReference
    - xmloff/source/core/makefile.mk:
      + add RDFaImportHelper.cxx
    #i90620#: implement RDFa export
    - xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
      + add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
      + add SvXMLExport::GetComponentContext()
      + add SvXMLExport::AddAttributesRDFa()
    - xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
      + new class RDFaExportHelper
      + don't use std::map::data_type, which is actually called
        std::map::mapped_type by libstdc++
    - xmloff/source/core/makefile.mk:
      + add RDFaExportHelper.cxx
    #i91563#
    - xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
      + XMLTextPAttrTokens: add RDFa tokens
    - xmloff/source/text/txtparai{.hxx,.cxx}:
      + import RDFa for text:p
    - xmloff/source/text/txtparae.cxx:
      + export RDFa for text:p
    interface change: use XHTML namespace instead of RDFA
    - xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
      xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
      xmloff/source/text/txtimp.cxx:
      + use XHTML namespace instead of RDFA
    #i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
    - xmloff/source/text/txtparai.cxx:
      + new class XMLMetaImportContextBase with subclasses to import
        text:meta and text:meta-field
    - xmloff/source/text/XMLTextMarkImportContext.cxx:
      + change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
        with no name (text:meta)
    #i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
    - xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
      + add FIELD_ID_META to FieldIdEnum
      + new method XMLTextFieldExport::ExportMetaField()
      + change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
        to take additional parameter for progress bar
    - xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
      + make XMLTextParagraphExport::exportTextRangeEnumeration() public
      + new method XMLTextParagraphExport::exportMeta()
    #i90620#
    - xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
      xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
      + rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
      + fix xml:id {im,ex}port for embedded documents and non-packages
      + adapt to API change: XMetadatable
    #i90620# GRDDL
    - xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
      xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
      + add GRDDL namespace
      + add token XML_TRANSFORMATION
      + add grddl:transformation attribute to root elements for meta.xml,
        content.xml and styles.xml
    2009-02-26 12:54:40 +0100 mst  r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
    #i90620#
    - unoxml/source/rdf/librdf_repository.cxx:
      + librdf_Repository::importGraph: allocate buffer sized length of stream
      + switch from one librdf_world per repository to a single static world
        because redland has global variables with a brain-damaged life-cycle...
      + exportGraph: use new raptor 1.4.18 feature to disable writing
        an xml:base attribute in RDF/XML files
    - unoxml/source/rdf/librdf_repository.cxx:
      unoxml/qa/complex/RDFRepositoryTest.java:
      + adapt to predicate is URI change
      + adapt to RDFa API change
      + adapt to API change: RDFa has multiple predicates...
      + adapt to API change: XMetadatable derives from XURI
      + allow xhtml:datatype without xhtml:content
      + adapt to API change: attribute MetadataReference is StringPair
    - unoxml/source/rdf/CURI.cxx:
      + add some more URI constants
    2009-02-26 12:53:32 +0100 mst  r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
    - package/inc/ImplValidCharacters.hxx:
      + remove (moved to comphelper)
    2009-02-26 12:52:49 +0100 mst  r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
    - comphelper/inc/comphelper/processfactory.hxx,
      comphelper/source/processfactory/processfactory.cxx:
      + add getProcessComponentContext()
      + change return type of comphelper_getProcessComponentContext to Reference
    - comphelper/inc/comphelper/stl_types.hxx:
      + add OUStringBufferAppender
      + add algorithm intersperse
    - comphelper/source/misc/string.cxx:
      + rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
    - comphelper/inc/comphelper/stlunosequence.hxx:
      + fix bug: begin() on empty sequence != end()
    2009-02-26 12:50:47 +0100 mst  r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
    #i96209#
    - offapi/com/sun/star/text/fieldmaster/*.idl:
      + rename module from FieldMaster to fieldmaster
    - offapi/type_reference/{typelibrary_history.txt,types.rdb}:
      + update reference types.rdb
    #i90620#
    - offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
      + API change: XMetadatable derives from XURI
      + API change: replace XmlId (string) with MetadataReference (StringPair)
    - offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
      XNamedGraph.idl,XRepository.idl}:
      + the predicate of a statement is a URI, not a Resource
    - offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
      + rename: s/Package/Document/
      + remove uuid
      + remove everything related to mapping
      + graph names are now generated from base URI and file names
      + load methods: improve error handling with XInteractionHandler
    - offapi/com/sun/star/rdf/XDocumentRepository.idl:
      + change: RDFa permits using multiple predicates in one attribute
      + setStatementRDFa: subject is now XResource, object is now XMetadatable
    - offapi/com/sun/star/rdf/URIs.idl:
      + add some more URI constants
    - offapi/com/sun/star/rdf:
      + fix @since tags and replace <method> with <member>
    2009-02-26 12:47:24 +0100 mst  r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
    fix #i93768#
    - redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
      + disable GRDDL parser to prevent call to libxslt
        xsltSetDefaultSecurityPrefs, which breaks xmlhelp
    - redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
      redland/raptor-1.4.18.patch:
      + upgrade raptor to 1.4.18
      + deactivate serializer for RSS/Atom (does not build)
    - redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
      redland/rasqal-0.9.16.patch,
      + upgrade rasqal to 0.9.16
    - redland/redland/makefile.mk, redland/redland-1.0.7.patch,
      redland/redland-1.0.8.patch:
      + upgrade redland to 1.0.8
    - redland/redlandversion.mk:
      + the librasqal SONAME has changed

diff --git a/package/inc/ImplValidCharacters.hxx b/package/inc/ImplValidCharacters.hxx
deleted file mode 100644
index 452523c..0000000
--- a/package/inc/ImplValidCharacters.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ImplValidCharacters.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _IMPL_VALID_CHARACTERS_HXX_
-#define _IMPL_VALID_CHARACTERS_HXX_
-
-#include <sal/types.h>
-
-static sal_Bool Impl_IsValidChar ( const sal_Unicode *pChar, sal_Int16 nLength, sal_Bool bSlashAllowed )
-{
-    for ( sal_Int16 i = 0 ; i < nLength ; i++ )
-    {
-        switch ( pChar[i] )
-        {
-            case '\\':
-            case '?':
-            case '<':
-            case '>':
-            case '\"':
-            case '|':
-            case ':':
-                return sal_False;
-            case '/':
-                if ( !bSlashAllowed )
-                    return sal_False;
-            break;
-            default:
-                if ( pChar[i] < 32  || pChar[i] > 127 )
-                    return sal_False;
-        }
-    }
-    return sal_True;
-}
-#endif
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index 9995c29..42e57de 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -37,9 +37,7 @@
 #include <PackageConstants.hxx>
 #include <ZipEntry.hxx>
 #include <ZipFile.hxx>
-#ifndef _VOS_REF_H_
 #include <vos/ref.hxx>
-#endif
 #include <com/sun/star/io/XOutputStream.hpp>
 
 #include <comphelper/storagehelper.hxx>
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index 3162679..4b66c07 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -31,10 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_package.hxx"
 #include <ZipPackageEntry.hxx>
-#ifndef _COM_SUN_STAR_PACKAGE_ZIP_ZIPCONSTANTS_HPP_
 #include <com/sun/star/packages/zip/ZipConstants.hpp>
-#endif
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 #include <ZipPackageFolder.hxx>
 #include <ZipPackageStream.hxx>


More information about the ooo-build-commit mailing list