[ooo-build-commit] 3 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Aug 14 00:44:55 PDT 2009
patches/dev300/apply | 16 ++++--
patches/dev300/fit-list-to-size-ui.diff | 6 --
patches/dev300/fit-list-to-size.diff | 85 ++++++++++++++++----------------
3 files changed, 58 insertions(+), 49 deletions(-)
New commits:
commit 78265d8b57415d878b7520cc6c582ca67227f7c7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 14 10:42:33 2009 +0300
Adapt fit-list-to-size to dev300-m54
* patches/dev300/fit-list-to-size.diff
* patches/dev300/fit-list-to-size-ui.diff: Adapt for dev300-m54. Note
that a couple of the hunks did not apply because of restructured
upstream code. There is no SdrTextObj::CheckHit() method any more,
and there is no ImpTextPortionHandler class any more. Those
hunks commented out in the diff with a FIXME note.
diff --git a/patches/dev300/fit-list-to-size-ui.diff b/patches/dev300/fit-list-to-size-ui.diff
index c173ac6..66af282 100644
--- a/patches/dev300/fit-list-to-size-ui.diff
+++ b/patches/dev300/fit-list-to-size-ui.diff
@@ -1,7 +1,5 @@
-diff --git a/svx/source/dialog/textattr.cxx b/svx/source/dialog/textattr.cxx
-index b4b1114..dd8f405 100644
---- svx/source/dialog/textattr.cxx
-+++ svx/source/dialog/textattr.cxx
+--- svx/source/cui/textattr.cxx
++++ svx/source/cui/textattr.cxx
@@ -460,7 +460,7 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
default: ; //prevent warning
DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" );
diff --git a/patches/dev300/fit-list-to-size.diff b/patches/dev300/fit-list-to-size.diff
index b61d67b..2e66521 100644
--- a/patches/dev300/fit-list-to-size.diff
+++ b/patches/dev300/fit-list-to-size.diff
@@ -46,8 +46,8 @@
interface DrawView
{
SID_JUMPTOMARK // ole : no, status : ?
---- svx/inc/svx/sdr/attribute/sdrtextattribute.hxx.old 2009-04-02 11:03:37.000000000 +0000
-+++ svx/inc/svx/sdr/attribute/sdrtextattribute.hxx 2009-04-06 16:42:18.000000000 +0000
+--- svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
++++ svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
@@ -65,6 +65,7 @@ namespace drawinglayer
// bitfield
unsigned mbContour : 1;
@@ -65,8 +65,8 @@
bool bBlink,
bool bScroll,
@@ -93,6 +95,7 @@ namespace drawinglayer
+ const OutlinerParaObject& getOutlinerParaObject() const { return maOutlinerParaObject; }
bool isContour() const { return mbContour; }
- bool isFontwork() const { return (XFT_NONE != meFormTextStyle); }
bool isFitToSize() const { return mbFitToSize; }
+ bool isAutoFit() const { return mbAutoFit; }
bool isHideContour() const { return mbHideContour; }
@@ -122,13 +122,13 @@
#endif //INCLUDED_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
// eof
---- svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx.old 2009-04-02 11:03:37.000000000 +0000
-+++ svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx 2009-04-06 16:42:18.000000000 +0000
+--- svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
++++ svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
@@ -52,6 +52,7 @@
- #define PRIMITIVE2D_ID_SDRSTRETCHTEXTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 13)
- #define PRIMITIVE2D_ID_SDRCELLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 14)
- #define PRIMITIVE2D_ID_SDRBORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 15)
-+#define PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 16)
+ #define PRIMITIVE2D_ID_OVERLAYHELPLINESTRIPEDPRIMITIVE (PRIMITIVE2D_ID_RANGE_SVX| 19)
+ #define PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE (PRIMITIVE2D_ID_RANGE_SVX| 20)
+ #define PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 21)
++#define PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 22)
//////////////////////////////////////////////////////////////////////////////
@@ -168,8 +168,8 @@
//--------------------------------
// class SdrTextFitToSizeTypeItem
---- svx/inc/svx/svdotext.hxx.old 2009-04-02 11:03:40.000000000 +0000
-+++ svx/inc/svx/svdotext.hxx 2009-04-06 16:42:18.000000000 +0000
+--- svx/inc/svx/svdotext.hxx
++++ svx/inc/svx/svdotext.hxx
@@ -62,6 +62,7 @@ namespace drawinglayer { namespace primi
class SdrContourTextPrimitive2D;
class SdrPathTextPrimitive2D;
@@ -194,7 +194,7 @@
Fraction& aFitXKorreg ) const;
+ void ImpAutoFitText( SdrOutliner& rOutliner ) const;
+ static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting );
- SVX_DLLPRIVATE SdrObject* ImpConvertObj(FASTBOOL bToPoly) const;
+ SVX_DLLPRIVATE SdrObject* ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const;
SVX_DLLPRIVATE void ImpLinkAnmeldung();
SVX_DLLPRIVATE void ImpLinkAbmeldung();
@@ -283,7 +289,7 @@ protected:
@@ -228,8 +228,8 @@
bool impDecomposeStretchTextPrimitive(
drawinglayer::primitive2d::Primitive2DSequence& rTarget,
const drawinglayer::primitive2d::SdrStretchTextPrimitive2D& rSdrStretchTextPrimitive,
---- svx/source/dialog/dbregisterednamesconfig.cxx.old 2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/dbregisterednamesconfig.cxx 2009-04-06 16:42:18.000000000 +0000
+--- svx/source/cui/dbregisterednamesconfig.cxx
++++ svx/source/cui/dbregisterednamesconfig.cxx
@@ -163,7 +163,7 @@ namespace svx
}
catch( const Exception& )
@@ -248,8 +248,8 @@
}
}
}
---- svx/source/dialog/textattr.cxx.old 2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/textattr.cxx 2009-04-06 16:42:18.000000000 +0000
+--- svx/source/cui/textattr.cxx
++++ svx/source/cui/textattr.cxx
@@ -460,7 +460,6 @@ BOOL SvxTextAttrPage::FillItemSet( SfxIt
default: ; //prevent warning
DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" );
@@ -607,8 +607,8 @@
bExtraInvalidate = sal_True;
}
---- svx/source/svdraw/svdfppt.cxx.old 2009-04-06 16:42:16.000000000 +0000
-+++ svx/source/svdraw/svdfppt.cxx 2009-04-06 16:42:18.000000000 +0000
+--- svx/source/svdraw/svdfppt.cxx
++++ svx/source/svdraw/svdfppt.cxx
@@ -1113,6 +1113,7 @@ SdrObject* SdrEscherImport::ProcessObj(
}
aTextObj.SetDestinationInstance( (sal_uInt16)nDestinationInstance );
@@ -720,16 +720,18 @@
if (nIsHgt==0) nIsHgt=1;
long nXTolPl=nWantWdt/100; // Toleranz +1%
-@@ -1143,8 +1147,7 @@ SdrObject* SdrTextObj::CheckHit(const Po
-
- INT32 nMyTol=nTol;
- FASTBOOL bFontwork=IsFontwork();
-- SdrFitToSizeType eFit=GetFitToSize();
-- FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
-+ FASTBOOL bFitToSize(IsFitToSize());
- Rectangle aR(aRect);
- Rectangle aAnchor2(aR);
- Rectangle aTextRect(aR);
+# FIXME: 2009-08-14: No CheckHit() method any longer --tml
+#
+# @@ -1143,8 +1147,7 @@ SdrObject* SdrTextObj::CheckHit(const Po
+#
+# INT32 nMyTol=nTol;
+# FASTBOOL bFontwork=IsFontwork();
+# - SdrFitToSizeType eFit=GetFitToSize();
+# - FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+# + FASTBOOL bFitToSize(IsFitToSize());
+# Rectangle aR(aRect);
+# Rectangle aAnchor2(aR);
+# Rectangle aTextRect(aR);
@@ -1377,8 +1380,7 @@ basegfx::B2DPolyPolygon SdrTextObj::Take
Rectangle aR;
TakeTextRect(rOutliner,aR,FALSE,&aAnchor2);
@@ -1118,18 +1120,21 @@
NbcAdjustTextFrameWidthAndHeight();
}
ImpCheckShear();
---- svx/source/svdraw/svdtxhdl.cxx.old 2009-04-02 11:03:00.000000000 +0000
-+++ svx/source/svdraw/svdtxhdl.cxx 2009-04-06 16:42:18.000000000 +0000
-@@ -85,8 +85,7 @@ void ImpTextPortionHandler::ConvertToPat
-
- Rectangle aAnchorRect;
- Rectangle aTextRect;
-- SdrFitToSizeType eFit=rTextObj.GetFitToSize();
-- FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
-+ FASTBOOL bFitToSize(rTextObj.IsFitToSize());
- // Bei TakeTextRect wird u.a. auch der Text in
- // den Outliner gesteckt
- rTextObj.TakeTextRect(rOutliner,aTextRect,FALSE,&aAnchorRect);
+# FIXME: 2009-08-14: No such file any longer, in fact no
+# ImpTextPortionHandler class any longer. --tml
+#
+# --- svx/source/svdraw/svdtxhdl.cxx.old 2009-04-02 11:03:00.000000000 +0000
+# +++ svx/source/svdraw/svdtxhdl.cxx 2009-04-06 16:42:18.000000000 +0000
+# @@ -85,8 +85,7 @@ void ImpTextPortionHandler::ConvertToPat
+#
+# Rectangle aAnchorRect;
+# Rectangle aTextRect;
+# - SdrFitToSizeType eFit=rTextObj.GetFitToSize();
+# - FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+# + FASTBOOL bFitToSize(rTextObj.IsFitToSize());
+# // Bei TakeTextRect wird u.a. auch der Text in
+# // den Outliner gesteckt
+# rTextObj.TakeTextRect(rOutliner,aTextRect,FALSE,&aAnchorRect);
--- svx/source/svdraw/svdview.cxx.old 2009-04-02 11:03:00.000000000 +0000
+++ svx/source/svdraw/svdview.cxx 2009-04-06 16:42:18.000000000 +0000
@@ -504,8 +504,7 @@ SdrHitKind SdrView::PickAnything(const P
commit 8ee9b83a32f6a824d2b7b8203cd7d6c70b2d1016
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 14 10:19:22 2009 +0300
sd-update-relative-links.diff seems to be upstream
* patches/dev300/apply: sd-update-relative-links.diff seems to be
upstream in dev300-m54 even if with sligh differences. Issue i#55224
is fixed and closed. Move it to UnUsedButNotYetRemovedFromGit for
now.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index afe424a..9f2b52b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2280,6 +2280,9 @@ transex3-localize-find.diff, i#102296, pmladek
gstreamer-sd.diff, i#68717, rodo
+# hyperlink issue with numeric slide names in Impress
+sd-update-relative-links.diff, n#355674, i#55224, rodo
+
[ Store ]
SectionOwner => rodo
SectionIssue => i#75399
@@ -2688,9 +2691,6 @@ sd-view-zoom-fix.diff, n#380013, i#88939, thorsten
sd-custom-show-fix.diff, n#355638, i#90145, thorsten
-# hyperlink issue with numeric slide names in Impress
-sd-update-relative-links.diff, n#355674, i#55224, rodo
-
# have Impress outline text boxes shrink font automatically when text
# starts to overflow
fit-list-to-size.diff, i#94086, thorsten
commit 18c8141d602661564305b29ee153e705f597351e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 14 10:15:42 2009 +0300
Bypass field-patch
* patches/dev300/apply: Bypass field-patch.diff and its add-on
field-patch-split-build.diff for now.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7b17081..afe424a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2670,9 +2670,15 @@ sw-section-header-export-problem.diff, i#100918, freuter
# FIXME: 2009-08-13: Does not apply, huh? --tml
# oox-fix-abs-relations.diff, n#493528, freuter
-field-patch.diff, n#248354, freuter
+# FIXME: 2009-08-14: Does not apply. Partly might be just trivialities,
+# but partly significant restructuring of the upstream code. --tml
+# field-patch.diff, n#248354, freuter
+
# FIXME: hack to fix split build by pmladek
-field-patch-split-build.diff, n#248354, freuter
+# FIXME: 2009-08-14: Changes what above did, so commented out,
+# too. --tml
+# field-patch-split-build.diff, n#248354, freuter
+
sw-import-html-controls.diff, n#485609, freuter
svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
More information about the ooo-build-commit
mailing list