[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 12 commits - canvas/source chart2/source configure.in cppu/inc default_images/minimizer default_images/presenter default_images/res extensions.lst extensions/source odk/docs offapi/com officecfg/registry postprocess/packcomponents postprocess/packregistry postprocess/prj sal/osl scaddins/source scp2/source sdext/prj sdext/source sd/inc sd/sdi sd/source sd/uiconfig set_soenv.in sw/source
Regina Henschel
regina at apache.org
Mon Mar 18 12:21:36 PDT 2013
canvas/source/directx/dx_textlayout.cxx | 6
canvas/source/directx/dx_textlayout_drawhelper.cxx | 40
canvas/source/directx/dx_textlayout_drawhelper.hxx | 6
chart2/source/controller/dialogs/tp_ChartType.src | 2
chart2/source/view/charttypes/Splines.cxx | 772 ++++--
chart2/source/view/charttypes/Splines.hxx | 6
configure.in | 35
cppu/inc/typelib/typedescription.h | 91
default_images/presenter/Background.png |binary
default_images/presenter/BorderActiveBottom.png |binary
default_images/presenter/BorderActiveBottomCallout.png |binary
default_images/presenter/BorderActiveBottomLeft.png |binary
default_images/presenter/BorderActiveBottomRight.png |binary
default_images/presenter/BorderActiveLeft.png |binary
default_images/presenter/BorderActiveRight.png |binary
default_images/presenter/BorderActiveTop.png |binary
default_images/presenter/BorderActiveTopLeft.png |binary
default_images/presenter/BorderActiveTopRight.png |binary
default_images/presenter/BorderBottom.png |binary
default_images/presenter/BorderBottomLeft.png |binary
default_images/presenter/BorderBottomRight.png |binary
default_images/presenter/BorderCurrentSlideBottom.png |binary
default_images/presenter/BorderCurrentSlideBottomLeft.png |binary
default_images/presenter/BorderCurrentSlideBottomRight.png |binary
default_images/presenter/BorderCurrentSlideLeft.png |binary
default_images/presenter/BorderCurrentSlideRight.png |binary
default_images/presenter/BorderCurrentSlideTop.png |binary
default_images/presenter/BorderCurrentSlideTopLeft.png |binary
default_images/presenter/BorderCurrentSlideTopRight.png |binary
default_images/presenter/BorderLeft.png |binary
default_images/presenter/BorderRight.png |binary
default_images/presenter/BorderToolbarBottom.png |binary
default_images/presenter/BorderToolbarLeft.png |binary
default_images/presenter/BorderToolbarRight.png |binary
default_images/presenter/BorderToolbarTop.png |binary
default_images/presenter/BorderToolbarTopLeft.png |binary
default_images/presenter/BorderToolbarTopRight.png |binary
default_images/presenter/BorderTop.png |binary
default_images/presenter/BorderTopLeft.png |binary
default_images/presenter/BorderTopRight.png |binary
default_images/presenter/ButtonEffectNextDisabled.png |binary
default_images/presenter/ButtonEffectNextMouseOver.png |binary
default_images/presenter/ButtonEffectNextNormal.png |binary
default_images/presenter/ButtonEffectNextSelected.png |binary
default_images/presenter/ButtonFrameCenterMouseOver.png |binary
default_images/presenter/ButtonFrameCenterNormal.png |binary
default_images/presenter/ButtonFrameLeftMouseOver.png |binary
default_images/presenter/ButtonFrameLeftNormal.png |binary
default_images/presenter/ButtonFrameRightMouseOver.png |binary
default_images/presenter/ButtonFrameRightNormal.png |binary
default_images/presenter/ButtonHelpDisabled.png |binary
default_images/presenter/ButtonHelpMouseOver.png |binary
default_images/presenter/ButtonHelpNormal.png |binary
default_images/presenter/ButtonHelpSelected.png |binary
default_images/presenter/ButtonMinusDisabled.png |binary
default_images/presenter/ButtonMinusMouseOver.png |binary
default_images/presenter/ButtonMinusNormal.png |binary
default_images/presenter/ButtonMinusSelected.png |binary
default_images/presenter/ButtonNotesDisabled.png |binary
default_images/presenter/ButtonNotesMouseOver.png |binary
default_images/presenter/ButtonNotesNormal.png |binary
default_images/presenter/ButtonNotesSelected.png |binary
default_images/presenter/ButtonPlusDisabled.png |binary
default_images/presenter/ButtonPlusMouseOver.png |binary
default_images/presenter/ButtonPlusNormal.png |binary
default_images/presenter/ButtonPlusSelected.png |binary
default_images/presenter/ButtonSlideNextDisabled.png |binary
default_images/presenter/ButtonSlideNextMouseOver.png |binary
default_images/presenter/ButtonSlideNextNormal.png |binary
default_images/presenter/ButtonSlidePreviousDisabled.png |binary
default_images/presenter/ButtonSlidePreviousMouseOver.png |binary
default_images/presenter/ButtonSlidePreviousNormal.png |binary
default_images/presenter/ButtonSlidePreviousSelected.png |binary
default_images/presenter/ButtonSlideSorterDisabled.png |binary
default_images/presenter/ButtonSlideSorterMouseOver.png |binary
default_images/presenter/ButtonSlideSorterNormal.png |binary
default_images/presenter/ButtonSlideSorterSelected.png |binary
default_images/presenter/LabelMouseOverCenter.png |binary
default_images/presenter/LabelMouseOverLeft.png |binary
default_images/presenter/LabelMouseOverRight.png |binary
default_images/presenter/ScrollbarArrowDownDisabled.png |binary
default_images/presenter/ScrollbarArrowDownMouseOver.png |binary
default_images/presenter/ScrollbarArrowDownNormal.png |binary
default_images/presenter/ScrollbarArrowDownSelected.png |binary
default_images/presenter/ScrollbarArrowUpDisabled.png |binary
default_images/presenter/ScrollbarArrowUpMouseOver.png |binary
default_images/presenter/ScrollbarArrowUpNormal.png |binary
default_images/presenter/ScrollbarArrowUpSelected.png |binary
default_images/presenter/ScrollbarPagerMiddleMouseOver.png |binary
default_images/presenter/ScrollbarPagerMiddleNormal.png |binary
default_images/presenter/ScrollbarThumbBottomMouseOver.png |binary
default_images/presenter/ScrollbarThumbBottomNormal.png |binary
default_images/presenter/ScrollbarThumbMiddleMouseOver.png |binary
default_images/presenter/ScrollbarThumbMiddleNormal.png |binary
default_images/presenter/ScrollbarThumbTopMouseOver.png |binary
default_images/presenter/ScrollbarThumbTopNormal.png |binary
default_images/presenter/ViewBackground.png |binary
default_images/res/commandimagelist/lc_presentationminimizer.png |binary
default_images/res/commandimagelist/lch_presentationminimizer.png |binary
default_images/res/commandimagelist/sc_presentationminimizer.png |binary
default_images/res/commandimagelist/sch_presentationminimizer.png |binary
dev/null |binary
extensions.lst | 12
extensions/source/ole/oleobjw.cxx | 4
extensions/source/ole/unoconversionutilities.hxx | 4
offapi/com/sun/star/chart2/CurveStyle.idl | 5
officecfg/registry/data/org/openoffice/Office/Impress.xcu | 170 +
officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu | 1220 ++++++++++
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 8
officecfg/registry/data/org/openoffice/Office/makefile.mk | 11
officecfg/registry/data/org/openoffice/makefile.mk | 7
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 127 +
officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs | 470 +++
officecfg/registry/schema/org/openoffice/Office/makefile.mk | 25
postprocess/packcomponents/makefile.mk | 4
postprocess/packregistry/makefile.mk | 4
postprocess/prj/build.lst | 2
sal/osl/unx/interlck.c | 3
sal/osl/unx/module.c | 7
scaddins/source/analysis/analysishelper.cxx | 8
scp2/source/ooo/file_library_ooo.scp | 26
scp2/source/ooo/file_resource_ooo.scp | 2
scp2/source/ooo/module_hidden_ooo.scp | 2
scp2/source/ooo/module_lang_template.scp | 3
sd/inc/app.hrc | 1
sd/sdi/drviewsh.sdi | 5
sd/sdi/sdraw.sdi | 25
sd/source/ui/presenter/PresenterHelper.cxx | 18
sd/source/ui/view/drviewse.cxx | 30
sd/uiconfig/simpress/menubar/menubar.xml | 1
sdext/prj/build.lst | 8
sdext/prj/d.lst | 33
sdext/source/minimizer/PresentationMinimizer.component | 30
sdext/source/minimizer/configurationaccess.cxx | 198 +
sdext/source/minimizer/configurationaccess.hxx | 18
sdext/source/minimizer/delzip | 1
sdext/source/minimizer/description.xml | 58
sdext/source/minimizer/fileopendialog.cxx | 62
sdext/source/minimizer/fileopendialog.hxx | 6
sdext/source/minimizer/graphiccollector.cxx | 61
sdext/source/minimizer/graphiccollector.hxx | 6
sdext/source/minimizer/help/component.txt | 2
sdext/source/minimizer/helpid.hrc | 57
sdext/source/minimizer/impoptimizer.cxx | 93
sdext/source/minimizer/impoptimizer.hxx | 9
sdext/source/minimizer/informationdialog.cxx | 215 +
sdext/source/minimizer/informationdialog.hxx | 75
sdext/source/minimizer/makefile.mk | 158 -
sdext/source/minimizer/manifest.xml | 36
sdext/source/minimizer/minimizer.hrc | 95
sdext/source/minimizer/minimizer.pmk | 24
sdext/source/minimizer/minimizer.src | 379 +++
sdext/source/minimizer/optimizationstats.cxx | 3
sdext/source/minimizer/optimizerdialog.cxx | 430 +--
sdext/source/minimizer/optimizerdialog.hxx | 244 --
sdext/source/minimizer/optimizerdialogcontrols.cxx | 289 +-
sdext/source/minimizer/pagecollector.cxx | 3
sdext/source/minimizer/pppoptimizer.cxx | 16
sdext/source/minimizer/pppoptimizer.hxx | 4
sdext/source/minimizer/pppoptimizerdialog.cxx | 194 -
sdext/source/minimizer/pppoptimizerdialog.hxx | 49
sdext/source/minimizer/pppoptimizertoken.cxx | 13
sdext/source/minimizer/pppoptimizertoken.hxx | 13
sdext/source/minimizer/pppoptimizeruno.cxx | 116
sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu | 86
sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu | 31
sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu | 404 ---
sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk | 46
sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk | 44
sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs | 346 --
sdext/source/minimizer/unodialog.cxx | 117
sdext/source/minimizer/unodialog.hxx | 44
sdext/source/presenter/Jobs.xcu | 41
sdext/source/presenter/PresenterAccessibility.cxx | 6
sdext/source/presenter/PresenterBitmapContainer.cxx | 21
sdext/source/presenter/PresenterBitmapContainer.hxx | 5
sdext/source/presenter/PresenterClock.cxx | 19
sdext/source/presenter/PresenterComponent.cxx | 146 -
sdext/source/presenter/PresenterComponent.hxx | 51
sdext/source/presenter/PresenterConfigurationAccess.cxx | 2
sdext/source/presenter/PresenterHelpView.cxx | 2
sdext/source/presenter/PresenterScreen.component | 30
sdext/source/presenter/PresenterScreen.cxx | 4
sdext/source/presenter/PresenterScreen.hrc | 113
sdext/source/presenter/PresenterScreen.src | 113
sdext/source/presenter/PresenterScrollBar.cxx | 4
sdext/source/presenter/PresenterSlideSorter.cxx | 6
sdext/source/presenter/PresenterTheme.cxx | 45
sdext/source/presenter/PresenterToolBar.cxx | 8
sdext/source/presenter/PresenterWindowManager.cxx | 4
sdext/source/presenter/ProtocolHandler.xcu | 31
sdext/source/presenter/components.cxx | 74
sdext/source/presenter/delzip | 1
sdext/source/presenter/description.xml | 58
sdext/source/presenter/help/component.txt | 2
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk | 47
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp | 180 -
sdext/source/presenter/makefile.mk | 393 ---
sdext/source/presenter/manifest.xml | 38
sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu | 41
sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu | 31
sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu | 1220 ----------
sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk | 47
sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk | 44
sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs | 465 ---
set_soenv.in | 2
sw/source/core/edit/edlingu.cxx | 4
207 files changed, 5255 insertions(+), 5321 deletions(-)
New commits:
commit 606d879864a9450bc362f26ee007fd610b1cf135
Author: Regina Henschel <regina at apache.org>
Date: Mon Mar 18 11:21:29 2013 +0000
i121722 corrected calculation for IMCSCH and IMSECH
Author: Maarten Kesselaers
Review by: Regina Henschel
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 278bd4e..32edb3f 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2223,8 +2223,8 @@ void Complex::Sech(void) THROWDEF_RTE_IAE
THROW_IAE;
double fScale =1.0 / ( cosh( 2.0 * r ) + cos( 2.0 * i ));
double r_;
- r_ = 2.0 * cosh( 2.0 * r ) * cos( i ) * fScale;
- i = - (2.0 * sinh( 2.0 * r ) * sin( i ) * fScale );
+ r_ = 2.0 * cosh( r ) * cos( i ) * fScale;
+ i = - (2.0 * sinh( r ) * sin( i ) * fScale );
r = r_ ;
}
else
@@ -2246,8 +2246,8 @@ void Complex::Csch(void) THROWDEF_RTE_IAE
THROW_IAE;
double fScale =1.0 / ( cosh( 2.0 * r ) - cos( 2.0 * i ));
double r_;
- r_ = 2.0 * sinh( 2.0 * r ) * cos( i ) * fScale;
- i = - ( 2.0 * cosh( 2.0 * r ) * sin( i ) * fScale );
+ r_ = 2.0 * sinh( r ) * cos( i ) * fScale;
+ i = - ( 2.0 * cosh( r ) * sin( i ) * fScale );
r = r_ ;
}
else
commit aa70a3d7c9df5d19b837a1b684fc44bf871e17d4
Author: Jürgen Schmidt <jsc at apache.org>
Date: Mon Mar 18 09:49:12 2013 +0000
removed, obsolete and not used anymore
diff --git a/odk/docs/images/orc-main-app_32.png b/odk/docs/images/orc-main-app_32.png
deleted file mode 100644
index b596295..0000000
Binary files a/odk/docs/images/orc-main-app_32.png and /dev/null differ
commit 4f7c31cdcf7ba9558e59bc345b3925f6b3d2695c
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Sun Mar 17 23:08:31 2013 +0000
Fix build breaker
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 9a10069..b4688c0 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1589,7 +1589,7 @@ TypeDescription IUnknownWrapper_Impl::getInterfaceMemberDescOfCurrentCall(const
{
typelib_TypeDescriptionReference* pTypeRefMember = pInterface->ppAllMembers[i];
typelib_TypeDescription* pDescMember= NULL;
- TYPELIB_DANGER_GET( &pDescMember, pTypeRefMember)
+ TYPELIB_DANGER_GET( &pDescMember, pTypeRefMember);
typelib_InterfaceMemberTypeDescription* pInterfaceMember=
(typelib_InterfaceMemberTypeDescription*) pDescMember;
@@ -1598,7 +1598,7 @@ TypeDescription IUnknownWrapper_Impl::getInterfaceMemberDescOfCurrentCall(const
pMember= pInterfaceMember;
break;
}
- TYPELIB_DANGER_RELEASE( pDescMember)
+ TYPELIB_DANGER_RELEASE( pDescMember);
}
if( pMember)
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 624f64d..d17883b 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -2034,9 +2034,9 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
typelib_TypeDescriptionReference *pSeqElemDescRef= pSeqDesc->pType; // type of the Sequence' elements
Type elemType( pSeqElemDescRef);
_typelib_TypeDescription* pSeqElemDesc=NULL;
- TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef)
+ TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef);
sal_uInt32 nelementSize= pSeqElemDesc->nSize;
- TYPELIB_DANGER_RELEASE( pSeqElemDesc)
+ TYPELIB_DANGER_RELEASE( pSeqElemDesc);
uno_Sequence *p_uno_Seq;
uno_sequence_construct( &p_uno_Seq, pDesc, NULL, length, cpp_acquire);
commit d6841c12bf1c65695714666d2f6f979c5a9795a9
Author: Regina Henschel <regina at apache.org>
Date: Sun Mar 17 14:59:33 2013 +0000
i117986 Adapt spline implementation to ODF1.2
Author: Regina Henschel
diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src
index 8821526..96ce23d 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.src
+++ b/chart2/source/controller/dialogs/tp_ChartType.src
@@ -241,7 +241,7 @@ ModalDialog DLG_SPLINE_PROPERTIES
{
Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS , POS_Y_SPLINES_3 ) ;
Size = MAP_APPFONT ( SPLINES_WIDTH_METRIC_TEXT , 10 ) ;
- Text [ en-US ] = "~Data points order" ;
+ Text [ en-US ] = "~Degree of polynomials" ;
};
MetricField MF_SPLINE_ORDER
{
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index d628c73..179a315 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -44,17 +44,6 @@ using namespace ::com::sun::star;
namespace
{
-template< typename T >
-struct lcl_EqualsFirstDoubleOfPair : ::std::binary_function< ::std::pair< double, T >, ::std::pair< double, T >, bool >
-{
- inline bool operator() ( const ::std::pair< double, T > & rOne, const ::std::pair< double, T > & rOther )
- {
- return ( ::rtl::math::approxEqual( rOne.first, rOther.first ) );
- }
-};
-
-//-----------------------------------------------------------------------------
-
typedef ::std::pair< double, double > tPointType;
typedef ::std::vector< tPointType > tPointVecType;
typedef tPointVecType::size_type lcl_tSizeType;
@@ -77,6 +66,16 @@ public:
double fY1FirstDerivation,
double fYnFirstDerivation );
+
+ /** @descr creates an object that calculates cublic splines on construction
+ for the special case of periodic cubic spline
+
+ @param rSortedPoints the points for which splines shall be calculated,
+ they need to be sorted in x values. First and last y value must be equal
+ */
+ lcl_SplineCalculation( const tPointVecType & rSortedPoints);
+
+
/** @descr this function corresponds to the function splint in [1].
[1] Numerical Recipies in C, 2nd edition
@@ -96,8 +95,8 @@ private:
double m_fYpN;
// these values are cached for performance reasons
- tPointVecType::size_type m_nKLow;
- tPointVecType::size_type m_nKHigh;
+ lcl_tSizeType m_nKLow;
+ lcl_tSizeType m_nKHigh;
double m_fLastInterpolatedValue;
/** @descr this function corresponds to the function spline in [1].
@@ -107,6 +106,22 @@ private:
Section 3.3, page 115
*/
void Calculate();
+
+ /** @descr this function corresponds to the algoritm 4.76 in [2] and
+ theorem 5.3.7 in [3]
+
+ [2] Engeln-Müllges, Gisela: Numerik-Algorithmen: Verfahren, Beispiele, Anwendungen
+ Springer, Berlin; Auflage: 9., überarb. und erw. A. (8. Dezember 2004)
+ Section 4.10.2, page 175
+
+ [3] Hanrath, Wilhelm: Mathematik III / Numerik, Vorlesungsskript zur
+ Veranstaltung im WS 2007/2008
+ Fachhochschule Aachen, 2009-09-19
+ Numerik_01.pdf, downloaded 2011-04-19 via
+ http://www.fh-aachen.de/index.php?id=11424&no_cache=1&file=5016&uid=44191
+ Section 5.3, page 129
+ */
+ void CalculatePeriodic();
};
//-----------------------------------------------------------------------------
@@ -122,21 +137,32 @@ lcl_SplineCalculation::lcl_SplineCalculation(
m_nKHigh( rSortedPoints.size() - 1 )
{
::rtl::math::setInf( &m_fLastInterpolatedValue, sal_False );
-
- // #108301# remove points that have equal x-values
- m_aPoints.erase( ::std::unique( m_aPoints.begin(), m_aPoints.end(),
- lcl_EqualsFirstDoubleOfPair< double >() ),
- m_aPoints.end() );
Calculate();
}
+//-----------------------------------------------------------------------------
+
+lcl_SplineCalculation::lcl_SplineCalculation(
+ const tPointVecType & rSortedPoints)
+ : m_aPoints( rSortedPoints ),
+ m_fYp1( 0.0 ), /*dummy*/
+ m_fYpN( 0.0 ), /*dummy*/
+ m_nKLow( 0 ),
+ m_nKHigh( rSortedPoints.size() - 1 )
+{
+ ::rtl::math::setInf( &m_fLastInterpolatedValue, sal_False );
+ CalculatePeriodic();
+}
+//-----------------------------------------------------------------------------
+
+
void lcl_SplineCalculation::Calculate()
{
if( m_aPoints.size() <= 1 )
return;
// n is the last valid index to m_aPoints
- const tPointVecType::size_type n = m_aPoints.size() - 1;
+ const lcl_tSizeType n = m_aPoints.size() - 1;
::std::vector< double > u( n );
m_aSecDerivY.resize( n + 1, 0.0 );
@@ -154,9 +180,9 @@ void lcl_SplineCalculation::Calculate()
((( m_aPoints[ 1 ].second - m_aPoints[ 0 ].second ) / xDiff ) - m_fYp1 );
}
- for( tPointVecType::size_type i = 1; i < n; ++i )
+ for( lcl_tSizeType i = 1; i < n; ++i )
{
- ::std::pair< double, double >
+ tPointType
p_i = m_aPoints[ i ],
p_im1 = m_aPoints[ i - 1 ],
p_ip1 = m_aPoints[ i + 1 ];
@@ -194,19 +220,164 @@ void lcl_SplineCalculation::Calculate()
// note: the algorithm in [1] iterates from n-1 to 0, but as size_type
// may be (usuall is) an unsigned type, we can not write k >= 0, as this
// is always true.
- for( tPointVecType::size_type k = n; k > 0; --k )
+ for( lcl_tSizeType k = n; k > 0; --k )
{
( m_aSecDerivY[ k - 1 ] *= m_aSecDerivY[ k ] ) += u[ k - 1 ];
}
}
+void lcl_SplineCalculation::CalculatePeriodic()
+{
+ if( m_aPoints.size() <= 1 )
+ return;
+
+ // n is the last valid index to m_aPoints
+ const lcl_tSizeType n = m_aPoints.size() - 1;
+
+ // u is used for vector f in A*c=f in [3], vector a in Ax=a in [2],
+ // vector z in Rtranspose z = a and Dr=z in [2]
+ ::std::vector< double > u( n + 1, 0.0 );
+
+ // used for vector c in A*c=f and vector x in Ax=a in [2]
+ m_aSecDerivY.resize( n + 1, 0.0 );
+
+ // diagonal of matrix A, used index 1 to n
+ ::std::vector< double > Adiag( n + 1, 0.0 );
+
+ // secondary diagonal of matrix A with index 1 to n-1 and upper right element in A[n]
+ ::std::vector< double > Aupper( n + 1, 0.0 );
+
+ // diagonal of matrix D in A=(R transpose)*D*R in [2], used index 1 to n
+ ::std::vector< double > Ddiag( n+1, 0.0 );
+
+ // right column of matrix R, used index 1 to n-2
+ ::std::vector< double > Rright( n-1, 0.0 );
+
+ // secondary diagonal of matrix R, used index 1 to n-1
+ ::std::vector< double > Rupper( n, 0.0 );
+
+ if (n<4)
+ {
+ if (n==3)
+ { // special handling of three polynomials, that are four points
+ double xDiff0 = m_aPoints[ 1 ].first - m_aPoints[ 0 ].first ;
+ double xDiff1 = m_aPoints[ 2 ].first - m_aPoints[ 1 ].first ;
+ double xDiff2 = m_aPoints[ 3 ].first - m_aPoints[ 2 ].first ;
+ double xDiff2p1 = xDiff2 + xDiff1;
+ double xDiff0p2 = xDiff0 + xDiff2;
+ double xDiff1p0 = xDiff1 + xDiff0;
+ double fFaktor = 1.5 / (xDiff0*xDiff1 + xDiff1*xDiff2 + xDiff2*xDiff0);
+ double yDiff0 = (m_aPoints[ 1 ].second - m_aPoints[ 0 ].second) / xDiff0;
+ double yDiff1 = (m_aPoints[ 2 ].second - m_aPoints[ 1 ].second) / xDiff1;
+ double yDiff2 = (m_aPoints[ 0 ].second - m_aPoints[ 2 ].second) / xDiff2;
+ m_aSecDerivY[ 1 ] = fFaktor * (yDiff1*xDiff2p1 - yDiff0*xDiff0p2);
+ m_aSecDerivY[ 2 ] = fFaktor * (yDiff2*xDiff0p2 - yDiff1*xDiff1p0);
+ m_aSecDerivY[ 3 ] = fFaktor * (yDiff0*xDiff1p0 - yDiff2*xDiff2p1);
+ m_aSecDerivY[ 0 ] = m_aSecDerivY[ 3 ];
+ }
+ else if (n==2)
+ {
+ // special handling of two polynomials, that are three points
+ double xDiff0 = m_aPoints[ 1 ].first - m_aPoints[ 0 ].first;
+ double xDiff1 = m_aPoints[ 2 ].first - m_aPoints[ 1 ].first;
+ double fHelp = 3.0 * (m_aPoints[ 0 ].second - m_aPoints[ 1 ].second) / (xDiff0*xDiff1);
+ m_aSecDerivY[ 1 ] = fHelp ;
+ m_aSecDerivY[ 2 ] = -fHelp ;
+ m_aSecDerivY[ 0 ] = m_aSecDerivY[ 2 ] ;
+ }
+ else
+ {
+ // should be handled with natural spline, periodic not possible.
+ }
+ }
+ else
+ {
+ double xDiff_i =1.0; // values are dummy;
+ double xDiff_im1 =1.0;
+ double yDiff_i = 1.0;
+ double yDiff_im1 = 1.0;
+ // fill matrix A and fill right side vector u
+ for( lcl_tSizeType i=1; i<n; ++i )
+ {
+ xDiff_im1 = m_aPoints[ i ].first - m_aPoints[ i-1 ].first;
+ xDiff_i = m_aPoints[ i+1 ].first - m_aPoints[ i ].first;
+ yDiff_im1 = (m_aPoints[ i ].second - m_aPoints[ i-1 ].second) / xDiff_im1;
+ yDiff_i = (m_aPoints[ i+1 ].second - m_aPoints[ i ].second) / xDiff_i;
+ Adiag[ i ] = 2 * (xDiff_im1 + xDiff_i);
+ Aupper[ i ] = xDiff_i;
+ u [ i ] = 3 * (yDiff_i - yDiff_im1);
+ }
+ xDiff_im1 = m_aPoints[ n ].first - m_aPoints[ n-1 ].first;
+ xDiff_i = m_aPoints[ 1 ].first - m_aPoints[ 0 ].first;
+ yDiff_im1 = (m_aPoints[ n ].second - m_aPoints[ n-1 ].second) / xDiff_im1;
+ yDiff_i = (m_aPoints[ 1 ].second - m_aPoints[ 0 ].second) / xDiff_i;
+ Adiag[ n ] = 2 * (xDiff_im1 + xDiff_i);
+ Aupper[ n ] = xDiff_i;
+ u [ n ] = 3 * (yDiff_i - yDiff_im1);
+
+ // decomposite A=(R transpose)*D*R
+ Ddiag[1] = Adiag[1];
+ Rupper[1] = Aupper[1] / Ddiag[1];
+ Rright[1] = Aupper[n] / Ddiag[1];
+ for( lcl_tSizeType i=2; i<=n-2; ++i )
+ {
+ Ddiag[i] = Adiag[i] - Aupper[ i-1 ] * Rupper[ i-1 ];
+ Rupper[ i ] = Aupper[ i ] / Ddiag[ i ];
+ Rright[ i ] = - Rright[ i-1 ] * Aupper[ i-1 ] / Ddiag[ i ];
+ }
+ Ddiag[ n-1 ] = Adiag[ n-1 ] - Aupper[ n-2 ] * Rupper[ n-2 ];
+ Rupper[ n-1 ] = ( Aupper[ n-1 ] - Aupper[ n-2 ] * Rright[ n-2] ) / Ddiag[ n-1 ];
+ double fSum = 0.0;
+ for ( lcl_tSizeType i=1; i<=n-2; ++i )
+ {
+ fSum += Ddiag[ i ] * Rright[ i ] * Rright[ i ];
+ }
+ Ddiag[ n ] = Adiag[ n ] - fSum - Ddiag[ n-1 ] * Rupper[ n-1 ] * Rupper[ n-1 ]; // bug in [2]!
+
+ // solve forward (R transpose)*z=u, overwrite u with z
+ for ( lcl_tSizeType i=2; i<=n-1; ++i )
+ {
+ u[ i ] -= u[ i-1 ]* Rupper[ i-1 ];
+ }
+ fSum = 0.0;
+ for ( lcl_tSizeType i=1; i<=n-2; ++i )
+ {
+ fSum += Rright[ i ] * u[ i ];
+ }
+ u[ n ] = u[ n ] - fSum - Rupper[ n - 1] * u[ n-1 ];
+
+ // solve forward D*r=z, z is in u, overwrite u with r
+ for ( lcl_tSizeType i=1; i<=n; ++i )
+ {
+ u[ i ] = u[i] / Ddiag[ i ];
+ }
+
+ // solve backward R*x= r, r is in u
+ m_aSecDerivY[ n ] = u[ n ];
+ m_aSecDerivY[ n-1 ] = u[ n-1 ] - Rupper[ n-1 ] * m_aSecDerivY[ n ];
+ for ( lcl_tSizeType i=n-2; i>=1; --i)
+ {
+ m_aSecDerivY[ i ] = u[ i ] - Rupper[ i ] * m_aSecDerivY[ i+1 ] - Rright[ i ] * m_aSecDerivY[ n ];
+ }
+ // periodic
+ m_aSecDerivY[ 0 ] = m_aSecDerivY[ n ];
+ }
+
+ // adapt m_aSecDerivY for usage in GetInterpolatedValue()
+ for( lcl_tSizeType i = 0; i <= n ; ++i )
+ {
+ m_aSecDerivY[ i ] *= 2.0;
+ }
+
+}
+
double lcl_SplineCalculation::GetInterpolatedValue( double x )
{
- DBG_ASSERT( ( m_aPoints[ 0 ].first <= x ) &&
+ OSL_PRECOND( ( m_aPoints[ 0 ].first <= x ) &&
( x <= m_aPoints[ m_aPoints.size() - 1 ].first ),
"Trying to extrapolate" );
- const tPointVecType::size_type n = m_aPoints.size() - 1;
+ const lcl_tSizeType n = m_aPoints.size() - 1;
if( x < m_fLastInterpolatedValue )
{
m_nKLow = 0;
@@ -216,7 +387,7 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x )
// first initialization is done in CTOR
while( m_nKHigh - m_nKLow > 1 )
{
- tPointVecType::size_type k = ( m_nKHigh + m_nKLow ) / 2;
+ lcl_tSizeType k = ( m_nKHigh + m_nKLow ) / 2;
if( m_aPoints[ k ].first > x )
m_nKHigh = k;
else
@@ -231,12 +402,12 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x )
++m_nKHigh;
++m_nKLow;
}
- DBG_ASSERT( m_nKHigh <= n, "Out of Bounds" );
+ OSL_ENSURE( m_nKHigh <= n, "Out of Bounds" );
}
m_fLastInterpolatedValue = x;
double h = m_aPoints[ m_nKHigh ].first - m_aPoints[ m_nKLow ].first;
- DBG_ASSERT( h != 0, "Bad input to GetInterpolatedValue()" );
+ OSL_ENSURE( h != 0, "Bad input to GetInterpolatedValue()" );
double a = ( m_aPoints[ m_nKHigh ].first - x ) / h;
double b = ( x - m_aPoints[ m_nKLow ].first ) / h;
@@ -250,73 +421,150 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x )
//-----------------------------------------------------------------------------
-//create knot vector for B-spline
-double* createTVector( sal_Int32 n, sal_Int32 k )
-{
- double* t = new double [n + k + 1];
- for (sal_Int32 i=0; i<=n+k; i++ )
- {
- if(i < k)
- t[i] = 0;
- else if(i <= n)
- t[i] = i-k+1;
+// helper methods for B-spline
+
+// Create parameter t_0 to t_n using the centripetal method with a power of 0.5
+bool createParameterT(const tPointVecType aUniquePoints, double* t)
+{ // precondition: no adjacent identical points
+ // postcondition: 0 = t_0 < t_1 < ... < t_n = 1
+ bool bIsSuccessful = true;
+ const lcl_tSizeType n = aUniquePoints.size() - 1;
+ t[0]=0.0;
+ double dx = 0.0;
+ double dy = 0.0;
+ double fDiffMax = 1.0; //dummy values
+ double fDenominator = 0.0; // initialized for summing up
+ for (lcl_tSizeType i=1; i<=n ; ++i)
+ { // 4th root(dx^2+dy^2)
+ dx = aUniquePoints[i].first - aUniquePoints[i-1].first;
+ dy = aUniquePoints[i].second - aUniquePoints[i-1].second;
+ // scaling to avoid underflow or overflow
+ fDiffMax = (fabs(dx)>fabs(dy)) ? fabs(dx) : fabs(dy);
+ if (fDiffMax == 0.0)
+ {
+ bIsSuccessful = false;
+ break;
+ }
else
- t[i] = n-k+2;
+ {
+ dx /= fDiffMax;
+ dy /= fDiffMax;
+ fDenominator += sqrt(sqrt(dx * dx + dy * dy)) * sqrt(fDiffMax);
+ }
}
- return t;
-}
+ if (fDenominator == 0.0)
+ {
+ bIsSuccessful = false;
+ }
+ if (bIsSuccessful)
+ {
+ for (lcl_tSizeType j=1; j<=n ; ++j)
+ {
+ double fNumerator = 0.0;
+ for (lcl_tSizeType i=1; i<=j ; ++i)
+ {
+ dx = aUniquePoints[i].first - aUniquePoints[i-1].first;
+ dy = aUniquePoints[i].second - aUniquePoints[i-1].second;
+ fDiffMax = (abs(dx)>abs(dy)) ? abs(dx) : abs(dy);
+ // same as above, so should not be zero
+ dx /= fDiffMax;
+ dy /= fDiffMax;
+ fNumerator += sqrt(sqrt(dx * dx + dy * dy)) * sqrt(fDiffMax);
+ }
+ t[j] = fNumerator / fDenominator;
-//calculate left knot vector
-double TLeft (double x, sal_Int32 i, sal_Int32 k, const double *t )
-{
- double deltaT = t[i + k - 1] - t[i];
- return (deltaT == 0.0)
- ? 0.0
- : (x - t[i]) / deltaT;
+ }
+ // postcondition check
+ t[n] = 1.0;
+ double fPrevious = 0.0;
+ for (lcl_tSizeType i=1; i <= n && bIsSuccessful ; ++i)
+ {
+ if (fPrevious >= t[i])
+ {
+ bIsSuccessful = false;
+ }
+ else
+ {
+ fPrevious = t[i];
+ }
+ }
+ }
+ return bIsSuccessful;
}
-//calculate right knot vector
-double TRight(double x, sal_Int32 i, sal_Int32 k, const double *t )
-{
- double deltaT = t[i + k] - t[i + 1];
- return (deltaT == 0.0)
- ? 0.0
- : (t[i + k] - x) / deltaT;
+void createKnotVector(const lcl_tSizeType n, const sal_uInt32 p, double* t, double* u)
+{ // precondition: 0 = t_0 < t_1 < ... < t_n = 1
+ for (lcl_tSizeType j = 0; j <= p; ++j)
+ {
+ u[j] = 0.0;
+ }
+ double fSum = 0.0;
+ for (lcl_tSizeType j = 1; j <= n-p; ++j )
+ {
+ fSum = 0.0;
+ for (lcl_tSizeType i = j; i <= j+p-1; ++i)
+ {
+ fSum += t[i];
+ }
+ u[j+p] = fSum / p ;
+ }
+ for (lcl_tSizeType j = n+1; j <= n+1+p; ++j)
+ {
+ u[j] = 1.0;
+ }
}
-//calculate weight vector
-void BVector(double x, sal_Int32 n, sal_Int32 k, double *b, const double *t)
+void applyNtoParameterT(const lcl_tSizeType i,const double tk,const sal_uInt32 p,const double* u, double* rowN)
{
- sal_Int32 i = 0;
- for( i=0; i<=n+k; i++ )
- b[i]=0;
+ // get N_p(t_k) recursively, only N_(i-p) till N_(i) are relevant, all other N_# are zero
+ double fRightFactor = 0.0;
+ double fLeftFactor = 0.0;
+
+ // initialize with indicator function degree 0
+ rowN[p] = 1.0; // all others are zero
+
+ // calculate up to degree p
+ for (sal_uInt32 s = 1; s <= p; ++s)
+ {
+ // first element
+ fRightFactor = ( u[i+1] - tk ) / ( u[i+1]- u[i-s+1] );
+ // i-s "true index" - (i-p)"shift" = p-s
+ rowN[p-s] = fRightFactor * rowN[p-s+1];
- sal_Int32 i0 = (sal_Int32)floor(x) + k - 1;
- b [i0] = 1;
+ // middle elements
+ for (sal_uInt32 j = s-1; j>=1 ; --j)
+ {
+ fLeftFactor = ( tk - u[i-j] ) / ( u[i-j+s] - u[i-j] ) ;
+ fRightFactor = ( u[i-j+s+1] - tk ) / ( u[i-j+s+1] - u[i-j+1] );
+ // i-j "true index" - (i-p)"shift" = p-j
+ rowN[p-j] = fLeftFactor * rowN[p-j] + fRightFactor * rowN[p-j+1];
+ }
- for( sal_Int32 j=2; j<=k; j++ )
- for( i=0; i<=i0; i++ )
- b[i] = TLeft(x, i, j, t) * b[i] + TRight(x, i, j, t) * b [i + 1];
+ // last element
+ fLeftFactor = ( tk - u[i] ) / ( u[i+s] - u[i] );
+ // i "true index" - (i-p)"shift" = p
+ rowN[p] = fLeftFactor * rowN[p];
+ }
}
} // anonymous namespace
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+// Calculates uniform parametric splines with subinterval length 1,
+// according ODF1.2 part 1, chapter 'chart interpolation'.
void SplineCalculater::CalculateCubicSplines(
const drawing::PolyPolygonShape3D& rInput
, drawing::PolyPolygonShape3D& rResult
- , sal_Int32 nGranularity )
+ , sal_uInt32 nGranularity )
{
- DBG_ASSERT( nGranularity > 0, "Granularity is invalid" );
+ OSL_PRECOND( nGranularity > 0, "Granularity is invalid" );
rResult.SequenceX.realloc(0);
rResult.SequenceY.realloc(0);
rResult.SequenceZ.realloc(0);
- sal_Int32 nOuterCount = rInput.SequenceX.getLength();
+ sal_uInt32 nOuterCount = rInput.SequenceX.getLength();
if( !nOuterCount )
return;
@@ -324,35 +572,23 @@ void SplineCalculater::CalculateCubicSplines(
rResult.SequenceY.realloc(nOuterCount);
rResult.SequenceZ.realloc(nOuterCount);
- for( sal_Int32 nOuter = 0; nOuter < nOuterCount; ++nOuter )
+ for( sal_uInt32 nOuter = 0; nOuter < nOuterCount; ++nOuter )
{
if( rInput.SequenceX[nOuter].getLength() <= 1 )
continue; //we need at least two points
- sal_Int32 nMaxIndexPoints = rInput.SequenceX[nOuter].getLength()-1; // is >=1
+ sal_uInt32 nMaxIndexPoints = rInput.SequenceX[nOuter].getLength()-1; // is >=1
const double* pOldX = rInput.SequenceX[nOuter].getConstArray();
const double* pOldY = rInput.SequenceY[nOuter].getConstArray();
const double* pOldZ = rInput.SequenceZ[nOuter].getConstArray();
- // #i13699# The curve gets a parameter and then for each coordinate a
- // separate spline will be calculated using the parameter as first argument
- // and the point coordinate as second argument. Therefore the points need
- // not to be sorted in its x-coordinates. The parameter is sorted by
- // construction.
-
::std::vector < double > aParameter(nMaxIndexPoints+1);
aParameter[0]=0.0;
- for( sal_Int32 nIndex=1; nIndex<=nMaxIndexPoints; nIndex++ )
+ for( sal_uInt32 nIndex=1; nIndex<=nMaxIndexPoints; nIndex++ )
{
- // The euclidian distance leads to curve loops for functions having single extreme points
- //aParameter[nIndex]=aParameter[nIndex-1]+
- //sqrt( (pOldX[nIndex]-pOldX[nIndex-1])*(pOldX[nIndex]-pOldX[nIndex-1])+
- //(pOldY[nIndex]-pOldY[nIndex-1])*(pOldY[nIndex]-pOldY[nIndex-1])+
- //(pOldZ[nIndex]-pOldZ[nIndex-1])*(pOldZ[nIndex]-pOldZ[nIndex-1]));
-
- // use increment of 1 instead
aParameter[nIndex]=aParameter[nIndex-1]+1;
}
+
// Split the calculation to X, Y and Z coordinate
tPointVecType aInputX;
aInputX.resize(nMaxIndexPoints+1);
@@ -360,7 +596,7 @@ void SplineCalculater::CalculateCubicSplines(
aInputY.resize(nMaxIndexPoints+1);
tPointVecType aInputZ;
aInputZ.resize(nMaxIndexPoints+1);
- for (sal_Int32 nN=0;nN<=nMaxIndexPoints; nN++ )
+ for (sal_uInt32 nN=0;nN<=nMaxIndexPoints; nN++ )
{
aInputX[ nN ].first=aParameter[nN];
aInputX[ nN ].second=pOldX[ nN ];
@@ -375,16 +611,20 @@ void SplineCalculater::CalculateCubicSplines(
double fXDerivation;
double fYDerivation;
double fZDerivation;
+ lcl_SplineCalculation* aSplineX;
+ lcl_SplineCalculation* aSplineY;
+ // lcl_SplineCalculation* aSplineZ; the z-coordinates of all points in
+ // a data series are equal. No spline calculation needed, but copy
+ // coordinate to output
+
if( pOldX[ 0 ] == pOldX[nMaxIndexPoints] &&
pOldY[ 0 ] == pOldY[nMaxIndexPoints] &&
- pOldZ[ 0 ] == pOldZ[nMaxIndexPoints] )
- {
- // #i101050# avoid a corner in closed lines, which are smoothed by spline
- // This derivation are special for parameter of kind 0,1,2,3... If you
- // change generating parameters (see above), then adapt derivations too.)
- fXDerivation = 0.5 * (pOldX[1]-pOldX[nMaxIndexPoints-1]);
- fYDerivation = 0.5 * (pOldY[1]-pOldY[nMaxIndexPoints-1]);
- fZDerivation = 0.5 * (pOldZ[1]-pOldZ[nMaxIndexPoints-1]);
+ pOldZ[ 0 ] == pOldZ[nMaxIndexPoints] &&
+ nMaxIndexPoints >=2 )
+ { // periodic spline
+ aSplineX = new lcl_SplineCalculation( aInputX) ;
+ aSplineY = new lcl_SplineCalculation( aInputY) ;
+ // aSplineZ = new lcl_SplineCalculation( aInputZ) ;
}
else // generate the kind "natural spline"
{
@@ -393,10 +633,10 @@ void SplineCalculater::CalculateCubicSplines(
fXDerivation = fInfty;
fYDerivation = fInfty;
fZDerivation = fInfty;
+ aSplineX = new lcl_SplineCalculation( aInputX, fXDerivation, fXDerivation );
+ aSplineY = new lcl_SplineCalculation( aInputY, fYDerivation, fYDerivation );
+ // aSplineZ = new lcl_SplineCalculation( aInputZ, fZDerivation, fZDerivation );
}
- lcl_SplineCalculation aSplineX( aInputX, fXDerivation, fXDerivation );
- lcl_SplineCalculation aSplineY( aInputY, fYDerivation, fYDerivation );
- lcl_SplineCalculation aSplineZ( aInputZ, fZDerivation, fZDerivation );
// fill result polygon with calculated values
rResult.SequenceX[nOuter].realloc( nMaxIndexPoints*nGranularity + 1);
@@ -407,13 +647,13 @@ void SplineCalculater::CalculateCubicSplines(
double* pNewY = rResult.SequenceY[nOuter].getArray();
double* pNewZ = rResult.SequenceZ[nOuter].getArray();
- sal_Int32 nNewPointIndex = 0; // Index in result points
+ sal_uInt32 nNewPointIndex = 0; // Index in result points
// needed for inner loop
double fInc; // step for intermediate points
- sal_Int32 nj; // for loop
+ sal_uInt32 nj; // for loop
double fParam; // a intermediate parameter value
- for( sal_Int32 ni = 0; ni < nMaxIndexPoints; ni++ )
+ for( sal_uInt32 ni = 0; ni < nMaxIndexPoints; ni++ )
{
// given point is surely a curve point
pNewX[nNewPointIndex] = pOldX[ni];
@@ -427,9 +667,10 @@ void SplineCalculater::CalculateCubicSplines(
{
fParam = aParameter[ni] + ( fInc * static_cast< double >( nj ) );
- pNewX[nNewPointIndex]=aSplineX.GetInterpolatedValue( fParam );
- pNewY[nNewPointIndex]=aSplineY.GetInterpolatedValue( fParam );
- pNewZ[nNewPointIndex]=aSplineZ.GetInterpolatedValue( fParam );
+ pNewX[nNewPointIndex]=aSplineX->GetInterpolatedValue( fParam );
+ pNewY[nNewPointIndex]=aSplineY->GetInterpolatedValue( fParam );
+ // pNewZ[nNewPointIndex]=aSplineZ->GetInterpolatedValue( fParam );
+ pNewZ[nNewPointIndex] = pOldZ[ni];
nNewPointIndex++;
}
}
@@ -437,18 +678,34 @@ void SplineCalculater::CalculateCubicSplines(
pNewX[nNewPointIndex] = pOldX[nMaxIndexPoints];
pNewY[nNewPointIndex] = pOldY[nMaxIndexPoints];
pNewZ[nNewPointIndex] = pOldZ[nMaxIndexPoints];
+ delete aSplineX;
+ delete aSplineY;
+ // delete aSplineZ;
}
}
+
+// The implementation follows closely ODF1.2 spec, chapter chart:interpolation
+// using the same names as in spec as far as possible, without prefix.
+// More details can be found on
+// Dr. C.-K. Shene: CS3621 Introduction to Computing with Geometry Notes
+// Unit 9: Interpolation and Approximation/Curve Global Interpolation
+// Department of Computer Science, Michigan Technological University
+// http://www.cs.mtu.edu/~shene/COURSES/cs3621/NOTES/
+// [last called 2011-05-20]
void SplineCalculater::CalculateBSplines(
const ::com::sun::star::drawing::PolyPolygonShape3D& rInput
, ::com::sun::star::drawing::PolyPolygonShape3D& rResult
- , sal_Int32 nGranularity
- , sal_Int32 nDegree )
+ , sal_uInt32 nResolution
+ , sal_uInt32 nDegree )
{
- // #issue 72216#
- // k is the order of the BSpline, nDegree is the degree of its polynoms
- sal_Int32 k = nDegree + 1;
+ // nResolution is ODF1.2 file format attribut chart:spline-resolution and
+ // ODF1.2 spec variable k. Causion, k is used as index in the spec in addition.
+ // nDegree is ODF1.2 file format attribut chart:spline-order and
+ // ODF1.2 spec variable p
+ OSL_ASSERT( nResolution > 1 );
+ OSL_ASSERT( nDegree >= 1 );
+ sal_uInt32 p = nDegree;
rResult.SequenceX.realloc(0);
rResult.SequenceY.realloc(0);
@@ -465,74 +722,257 @@ void SplineCalculater::CalculateBSplines(
for( sal_Int32 nOuter = 0; nOuter < nOuterCount; ++nOuter )
{
if( rInput.SequenceX[nOuter].getLength() <= 1 )
- continue; // need at least 2 control points
-
- sal_Int32 n = rInput.SequenceX[nOuter].getLength()-1; // maximum index of control points
-
- double fCurveparam =0.0; // parameter for the curve
- // 0<= fCurveparam < fMaxCurveparam
- double fMaxCurveparam = 2.0+ n - k;
- if (fMaxCurveparam <= 0.0)
- return; // not enough control points for desired spline order
-
- if (nGranularity < 1)
- return; //need at least 1 line for each part beween the control points
+ continue; // need at least 2 points, next piece of the series
+ // Copy input to vector of points and remove adjacent double points. The
+ // Z-coordinate is equal for all points in a series and holds the depth
+ // in 3D mode, simple copying is enough.
+ lcl_tSizeType nMaxIndexPoints = rInput.SequenceX[nOuter].getLength()-1; // is >=1
const double* pOldX = rInput.SequenceX[nOuter].getConstArray();
const double* pOldY = rInput.SequenceY[nOuter].getConstArray();
const double* pOldZ = rInput.SequenceZ[nOuter].getConstArray();
+ double fZCoordinate = pOldZ[0];
+ tPointVecType aPointsIn;
+ aPointsIn.resize(nMaxIndexPoints+1);
+ for (lcl_tSizeType i = 0; i <= nMaxIndexPoints; ++i )
+ {
+ aPointsIn[ i ].first = pOldX[i];
+ aPointsIn[ i ].second = pOldY[i];
+ }
+ aPointsIn.erase( ::std::unique( aPointsIn.begin(), aPointsIn.end()),
+ aPointsIn.end() );
+
+ // n is the last valid index to the reduced aPointsIn
+ // There are n+1 valid data points.
+ const lcl_tSizeType n = aPointsIn.size() - 1;
+ if (n < 1 || p > n)
+ continue; // need at least 2 points, degree p needs at least n+1 points
+ // next piece of series
+
+ double* t = new double [n+1];
+ if (!createParameterT(aPointsIn, t))
+ {
+ delete[] t;
+ continue; // next piece of series
+ }
- // keep this amount of steps to go well with old version
- sal_Int32 nNewSectorCount = nGranularity * n;
- double fCurveStep = fMaxCurveparam/static_cast< double >(nNewSectorCount);
-
- double *b = new double [n + k + 1]; // values of blending functions
-
- const double* t = createTVector(n, k); // knot vector
-
- rResult.SequenceX[nOuter].realloc(nNewSectorCount+1);
- rResult.SequenceY[nOuter].realloc(nNewSectorCount+1);
- rResult.SequenceZ[nOuter].realloc(nNewSectorCount+1);
- double* pNewX = rResult.SequenceX[nOuter].getArray();
- double* pNewY = rResult.SequenceY[nOuter].getArray();
- double* pNewZ = rResult.SequenceZ[nOuter].getArray();
-
- // variables needed inside loop, when calculating one point of output
- sal_Int32 nPointIndex =0; //index of given contol points
- double fX=0.0;
- double fY=0.0;
- double fZ=0.0; //coordinates of a new BSpline point
-
- for(sal_Int32 nNewSector=0; nNewSector<nNewSectorCount; nNewSector++)
- { // in first looping fCurveparam has value 0.0
-
- // Calculate the values of the blending functions for actual curve parameter
- BVector(fCurveparam, n, k, b, t);
-
- // output point(fCurveparam) = sum over {input point * value of blending function}
- fX = 0.0;
- fY = 0.0;
- fZ = 0.0;
- for (nPointIndex=0;nPointIndex<=n;nPointIndex++)
+ lcl_tSizeType m = n + p + 1;
+ double* u = new double [m+1];
+ createKnotVector(n, p, t, u);
+
+ // The matrix N contains the B-spline basis functions applied to parameters.
+ // In each row only p+1 adjacent elements are non-zero. The starting
+ // column in a higher row is equal or greater than in the lower row.
+ // To store this matrix the non-zero elements are shifted to column 0
+ // and the amount of shifting is remembered in an array.
+ double** aMatN = new double*[n+1];
+ for (lcl_tSizeType row = 0; row <=n; ++row)
+ {
+ aMatN[row] = new double[p+1];
+ for (sal_uInt32 col = 0; col <= p; ++col)
+ aMatN[row][col] = 0.0;
+ }
+ lcl_tSizeType* aShift = new lcl_tSizeType[n+1];
+ aMatN[0][0] = 1.0; //all others are zero
+ aShift[0] = 0;
+ aMatN[n][0] = 1.0;
+ aShift[n] = n;
+ for (lcl_tSizeType k = 1; k<=n-1; ++k)
+ { // all basis functions are applied to t_k,
+ // results are elements in row k in matrix N
+
+ // find the one interval with u_i <= t_k < u_(i+1)
+ // remember u_0 = ... = u_p = 0.0 and u_(m-p) = ... u_m = 1.0 and 0<t_k<1
+ lcl_tSizeType i = p;
+ while (!(u[i] <= t[k] && t[k] < u[i+1]))
{
- fX +=pOldX[nPointIndex]*b[nPointIndex];
- fY +=pOldY[nPointIndex]*b[nPointIndex];
- fZ +=pOldZ[nPointIndex]*b[nPointIndex];
+ ++i;
}
- pNewX[nNewSector] = fX;
- pNewY[nNewSector] = fY;
- pNewZ[nNewSector] = fZ;
- fCurveparam += fCurveStep; //for next looping
+ // index in reduced matrix aMatN = (index in full matrix N) - (i-p)
+ aShift[k] = i - p;
+
+ applyNtoParameterT(i, t[k], p, u, aMatN[k]);
+ } // next row k
+
+ // Get matrix C of control points from the matrix equation aMatN * C = aPointsIn
+ // aPointsIn is overwritten with C.
+ // Gaussian elimination is possible without pivoting, see reference
+ lcl_tSizeType r = 0; // true row index
+ lcl_tSizeType c = 0; // true column index
+ double fDivisor = 1.0; // used for diagonal element
+ double fEliminate = 1.0; // used for the element, that will become zero
+ double fHelp;
+ tPointType aHelp;
+ lcl_tSizeType nHelp; // used in triangle change
+ bool bIsSuccessful = true;
+ for (c = 0 ; c <= n && bIsSuccessful; ++c)
+ {
+ // search for first non-zero downwards
+ r = c;
+ while ( aMatN[r][c-aShift[r]] == 0 && r < n)
+ {
+ ++r;
+ }
+ if (aMatN[r][c-aShift[r]] == 0.0)
+ {
+ // Matrix N is singular, although this is mathematically impossible
+ bIsSuccessful = false;
+ }
+ else
+ {
+ // exchange total row r with total row c if necessary
+ if (r != c)
+ {
+ for ( sal_uInt32 i = 0; i <= p ; ++i)
+ {
+ fHelp = aMatN[r][i];
+ aMatN[r][i] = aMatN[c][i];
+ aMatN[c][i] = fHelp;
+ }
+ aHelp = aPointsIn[r];
+ aPointsIn[r] = aPointsIn[c];
+ aPointsIn[c] = aHelp;
+ nHelp = aShift[r];
+ aShift[r] = aShift[c];
+ aShift[c] = nHelp;
+ }
+
+ // divide row c, so that element(c,c) becomes 1
+ fDivisor = aMatN[c][c-aShift[c]]; // not zero, see above
+ for (sal_uInt32 i = 0; i <= p; ++i)
+ {
+ aMatN[c][i] /= fDivisor;
+ }
+ aPointsIn[c].first /= fDivisor;
+ aPointsIn[c].second /= fDivisor;
+
+ // eliminate forward, examine row c+1 to n-1 (worst case)
+ // stop if first non-zero element in row has an higher column as c
+ // look at nShift for that, elements in nShift are equal or increasing
+ for ( r = c+1; aShift[r]<=c && r < n; ++r)
+ {
+ fEliminate = aMatN[r][0];
+ if (fEliminate != 0.0) // else accidentally zero, nothing to do
+ {
+ for (sal_uInt32 i = 1; i <= p; ++i)
+ {
+ aMatN[r][i-1] = aMatN[r][i] - fEliminate * aMatN[c][i];
+ }
+ aMatN[r][p]=0;
+ aPointsIn[r].first -= fEliminate * aPointsIn[c].first;
+ aPointsIn[r].second -= fEliminate * aPointsIn[c].second;
+ ++aShift[r];
+ }
+ }
+ }
+ }// upper triangle form is reached
+ if( bIsSuccessful)
+ {
+ // eliminate backwards, begin with last column
+ for (lcl_tSizeType cc = n; cc >= 1; --cc )
+ {
+ // In row cc the diagonal element(cc,cc) == 1 and all elements left from
+ // diagonal are zero and do not influence other rows.
+ // Full matrix N has semibandwidth < p, therefore element(r,c) is
+ // zero, if abs(r-cc)>=p. abs(r-cc)=cc-r, because r<cc.
+ r = cc - 1;
+ while ( r !=0 && cc-r < p )
+ {
+ fEliminate = aMatN[r][ cc - aShift[r] ];
+ if ( fEliminate != 0.0) // else element is accidentically zero, no action needed
+ {
+ // row r -= fEliminate * row cc only relevant for right side
+ aMatN[r][cc - aShift[r]] = 0.0;
+ aPointsIn[r].first -= fEliminate * aPointsIn[cc].first;
+ aPointsIn[r].second -= fEliminate * aPointsIn[cc].second;
+ }
+ --r;
+ }
+ }
+ } // aPointsIn contains the control points now.
+ if (bIsSuccessful)
+ {
+ // calculate the intermediate points according given resolution
+ // using deBoor-Cox algorithm
+ lcl_tSizeType nNewSize = nResolution * n + 1;
+ rResult.SequenceX[nOuter].realloc(nNewSize);
+ rResult.SequenceY[nOuter].realloc(nNewSize);
+ rResult.SequenceZ[nOuter].realloc(nNewSize);
+ double* pNewX = rResult.SequenceX[nOuter].getArray();
+ double* pNewY = rResult.SequenceY[nOuter].getArray();
+ double* pNewZ = rResult.SequenceZ[nOuter].getArray();
+ pNewX[0] = aPointsIn[0].first;
+ pNewY[0] = aPointsIn[0].second;
+ pNewZ[0] = fZCoordinate; // Precondition: z-coordinates of all points of a series are equal
+ pNewX[nNewSize -1 ] = aPointsIn[n].first;
+ pNewY[nNewSize -1 ] = aPointsIn[n].second;
+ pNewZ[nNewSize -1 ] = fZCoordinate;
+ double* aP = new double[m+1];
+ lcl_tSizeType nLow = 0;
+ for ( lcl_tSizeType nTIndex = 0; nTIndex <= n-1; ++nTIndex)
+ {
+ for (sal_uInt32 nResolutionStep = 1;
+ nResolutionStep <= nResolution && !( nTIndex == n-1 && nResolutionStep == nResolution);
+ ++nResolutionStep)
+ {
+ lcl_tSizeType nNewIndex = nTIndex * nResolution + nResolutionStep;
+ double ux = t[nTIndex] + nResolutionStep * ( t[nTIndex+1] - t[nTIndex]) /nResolution;
+
+ // get index nLow, so that u[nLow]<= ux < u[nLow +1]
+ // continue from previous nLow
+ while ( u[nLow] <= ux)
+ {
+ ++nLow;
+ }
+ --nLow;
+
+ // x-coordinate
+ for (lcl_tSizeType i = nLow-p; i <= nLow; ++i)
+ {
+ aP[i] = aPointsIn[i].first;
+ }
+ for (sal_uInt32 lcl_Degree = 1; lcl_Degree <= p; ++lcl_Degree)
+ {
+ double fFactor = 0.0;
+ for (lcl_tSizeType i = nLow; i >= nLow + lcl_Degree - p; --i)
+ {
+ fFactor = ( ux - u[i] ) / ( u[i+p+1-lcl_Degree] - u[i]);
+ aP[i] = (1 - fFactor)* aP[i-1] + fFactor * aP[i];
+ }
+ }
+ pNewX[nNewIndex] = aP[nLow];
+
+ // y-coordinate
+ for (lcl_tSizeType i = nLow - p; i <= nLow; ++i)
+ {
+ aP[i] = aPointsIn[i].second;
+ }
+ for (sal_uInt32 lcl_Degree = 1; lcl_Degree <= p; ++lcl_Degree)
+ {
+ double fFactor = 0.0;
+ for (lcl_tSizeType i = nLow; i >= nLow +lcl_Degree - p; --i)
+ {
+ fFactor = ( ux - u[i] ) / ( u[i+p+1-lcl_Degree] - u[i]);
+ aP[i] = (1 - fFactor)* aP[i-1] + fFactor * aP[i];
+ }
+ }
+ pNewY[nNewIndex] = aP[nLow];
+ pNewZ[nNewIndex] = fZCoordinate;
+ }
+ }
+ delete[] aP;
}
- // add last control point to BSpline curve
- pNewX[nNewSectorCount] = pOldX[n];
- pNewY[nNewSectorCount] = pOldY[n];
- pNewZ[nNewSectorCount] = pOldZ[n];
-
+ delete[] aShift;
+ for (lcl_tSizeType row = 0; row <=n; ++row)
+ {
+ delete[] aMatN[row];
+ }
+ delete[] aMatN;
+ delete[] u;
delete[] t;
- delete[] b;
- }
+
+ } // next piece of the series
}
//.............................................................................
diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx
index b12f7d2..c3f4263 100644
--- a/chart2/source/view/charttypes/Splines.hxx
+++ b/chart2/source/view/charttypes/Splines.hxx
@@ -41,13 +41,13 @@ public:
static void CalculateCubicSplines(
const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints
, ::com::sun::star::drawing::PolyPolygonShape3D& rResult
- , sal_Int32 nGranularity );
+ , sal_uInt32 nGranularity );
static void CalculateBSplines(
const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints
, ::com::sun::star::drawing::PolyPolygonShape3D& rResult
- , sal_Int32 nGranularity
- , sal_Int32 nSplineDepth );
+ , sal_uInt32 nGranularity
+ , sal_uInt32 nSplineDepth );
};
diff --git a/offapi/com/sun/star/chart2/CurveStyle.idl b/offapi/com/sun/star/chart2/CurveStyle.idl
index 2e7cf5b..97f5949 100644
--- a/offapi/com/sun/star/chart2/CurveStyle.idl
+++ b/offapi/com/sun/star/chart2/CurveStyle.idl
@@ -45,9 +45,8 @@ enum CurveStyle
*/
CUBIC_SPLINES,
- /** Data points are connected via a smoothed B-spline curve. The
- data points themselves are not necessarily part of to the
- curve.
+ /** Data points are connected via a parametric, interpolating
+ B-spline curve.
*/
B_SPLINES,
commit 7c9964d111937a0af503633a8f16195183747d43
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Fri Mar 15 22:21:53 2013 +0000
i121873 - Integrate the Presenter Screen
diff --git a/configure.in b/configure.in
index 1f22d77..dca026b 100644
--- a/configure.in
+++ b/configure.in
@@ -519,9 +519,6 @@ AC_ARG_WITH(beanshell-jar,
[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
[ BSH_JAR="$withval"
])
-AC_ARG_ENABLE(presenter-screen,
-[ --enable-presenter-screen enables the build of the Presenter Screen extension
-],,)
AC_ARG_ENABLE(pdfimport,
[ --enable-pdfimport enables the build of the PDF Import extension
],,)
@@ -6411,16 +6408,6 @@ fi
AC_SUBST(ENABLE_OPENGL)
-AC_MSG_CHECKING([whether to build the Presenter Screen extension])
-if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then
- AC_MSG_RESULT([yes])
- ENABLE_PRESENTER_SCREEN=YES
-else
- AC_MSG_RESULT([no])
- ENABLE_PRESENTER_SCREEN=NO
-fi
-AC_SUBST(ENABLE_PRESENTER_SCREEN)
-
AC_MSG_CHECKING([whether to build the PDF Import extension])
if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
AC_MSG_RESULT([yes])
@@ -6449,16 +6436,6 @@ AC_SUBST(SYSTEM_POPPLER)
AC_SUBST(POPPLER_CFLAGS)
AC_SUBST(POPPLER_LIBS)
-if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
- AC_MSG_CHECKING([for sdext module])
- if test -d ./sdext; then
- AC_MSG_RESULT([OK])
- else
- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
- fi
- BUILD_TYPE="$BUILD_TYPE SDEXT"
-fi
-
AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then
AC_MSG_RESULT([yes])
diff --git a/default_images/presenter/Background.png b/default_images/presenter/Background.png
new file mode 100644
index 0000000..7b32e4a
Binary files /dev/null and b/default_images/presenter/Background.png differ
diff --git a/default_images/presenter/BorderActiveBottom.png b/default_images/presenter/BorderActiveBottom.png
new file mode 100644
index 0000000..8314c9e
Binary files /dev/null and b/default_images/presenter/BorderActiveBottom.png differ
diff --git a/default_images/presenter/BorderActiveBottomCallout.png b/default_images/presenter/BorderActiveBottomCallout.png
new file mode 100644
index 0000000..b7c3322
Binary files /dev/null and b/default_images/presenter/BorderActiveBottomCallout.png differ
diff --git a/default_images/presenter/BorderActiveBottomLeft.png b/default_images/presenter/BorderActiveBottomLeft.png
new file mode 100644
index 0000000..8d573e8
Binary files /dev/null and b/default_images/presenter/BorderActiveBottomLeft.png differ
diff --git a/default_images/presenter/BorderActiveBottomRight.png b/default_images/presenter/BorderActiveBottomRight.png
new file mode 100644
index 0000000..35ef8e9
Binary files /dev/null and b/default_images/presenter/BorderActiveBottomRight.png differ
diff --git a/default_images/presenter/BorderActiveLeft.png b/default_images/presenter/BorderActiveLeft.png
new file mode 100644
index 0000000..57d4a3d
Binary files /dev/null and b/default_images/presenter/BorderActiveLeft.png differ
diff --git a/default_images/presenter/BorderActiveRight.png b/default_images/presenter/BorderActiveRight.png
new file mode 100644
index 0000000..9a98571
Binary files /dev/null and b/default_images/presenter/BorderActiveRight.png differ
diff --git a/default_images/presenter/BorderActiveTop.png b/default_images/presenter/BorderActiveTop.png
new file mode 100644
index 0000000..e0bea9d
Binary files /dev/null and b/default_images/presenter/BorderActiveTop.png differ
diff --git a/default_images/presenter/BorderActiveTopLeft.png b/default_images/presenter/BorderActiveTopLeft.png
new file mode 100644
index 0000000..62d6327
Binary files /dev/null and b/default_images/presenter/BorderActiveTopLeft.png differ
diff --git a/default_images/presenter/BorderActiveTopRight.png b/default_images/presenter/BorderActiveTopRight.png
new file mode 100644
index 0000000..450c8e0
Binary files /dev/null and b/default_images/presenter/BorderActiveTopRight.png differ
diff --git a/default_images/presenter/BorderBottom.png b/default_images/presenter/BorderBottom.png
new file mode 100644
index 0000000..7ad2fd6
Binary files /dev/null and b/default_images/presenter/BorderBottom.png differ
diff --git a/default_images/presenter/BorderBottomLeft.png b/default_images/presenter/BorderBottomLeft.png
new file mode 100644
index 0000000..019de14
Binary files /dev/null and b/default_images/presenter/BorderBottomLeft.png differ
diff --git a/default_images/presenter/BorderBottomRight.png b/default_images/presenter/BorderBottomRight.png
new file mode 100644
index 0000000..82de579
Binary files /dev/null and b/default_images/presenter/BorderBottomRight.png differ
diff --git a/default_images/presenter/BorderCurrentSlideBottom.png b/default_images/presenter/BorderCurrentSlideBottom.png
new file mode 100644
index 0000000..7000bc2
Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideBottom.png differ
diff --git a/default_images/presenter/BorderCurrentSlideBottomLeft.png b/default_images/presenter/BorderCurrentSlideBottomLeft.png
new file mode 100644
index 0000000..7571c8d
Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideBottomLeft.png differ
diff --git a/default_images/presenter/BorderCurrentSlideBottomRight.png b/default_images/presenter/BorderCurrentSlideBottomRight.png
new file mode 100644
index 0000000..c0af63f
Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideBottomRight.png differ
diff --git a/default_images/presenter/BorderCurrentSlideLeft.png b/default_images/presenter/BorderCurrentSlideLeft.png
new file mode 100644
index 0000000..7000bc2
Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideLeft.png differ
diff --git a/default_images/presenter/BorderCurrentSlideRight.png b/default_images/presenter/BorderCurrentSlideRight.png
new file mode 100644
index 0000000..7000bc2
Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideRight.png differ
diff --git a/default_images/presenter/BorderCurrentSlideTop.png b/default_images/presenter/BorderCurrentSlideTop.png
new file mode 100644
index 0000000..7000bc2
Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideTop.png differ
diff --git a/default_images/presenter/BorderCurrentSlideTopLeft.png b/default_images/presenter/BorderCurrentSlideTopLeft.png
new file mode 100644
index 0000000..fdfabd4
Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideTopLeft.png differ
diff --git a/default_images/presenter/BorderCurrentSlideTopRight.png b/default_images/presenter/BorderCurrentSlideTopRight.png
new file mode 100644
index 0000000..5b4b642
Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideTopRight.png differ
diff --git a/default_images/presenter/BorderLeft.png b/default_images/presenter/BorderLeft.png
new file mode 100644
index 0000000..cbdb267
Binary files /dev/null and b/default_images/presenter/BorderLeft.png differ
diff --git a/default_images/presenter/BorderRight.png b/default_images/presenter/BorderRight.png
new file mode 100644
index 0000000..3330733
Binary files /dev/null and b/default_images/presenter/BorderRight.png differ
diff --git a/default_images/presenter/BorderToolbarBottom.png b/default_images/presenter/BorderToolbarBottom.png
new file mode 100644
index 0000000..23a3bc3
Binary files /dev/null and b/default_images/presenter/BorderToolbarBottom.png differ
diff --git a/default_images/presenter/BorderToolbarLeft.png b/default_images/presenter/BorderToolbarLeft.png
new file mode 100644
index 0000000..839ab50
Binary files /dev/null and b/default_images/presenter/BorderToolbarLeft.png differ
diff --git a/default_images/presenter/BorderToolbarRight.png b/default_images/presenter/BorderToolbarRight.png
new file mode 100644
index 0000000..e5c4b9d
Binary files /dev/null and b/default_images/presenter/BorderToolbarRight.png differ
diff --git a/default_images/presenter/BorderToolbarTop.png b/default_images/presenter/BorderToolbarTop.png
new file mode 100644
index 0000000..c45b97c
Binary files /dev/null and b/default_images/presenter/BorderToolbarTop.png differ
diff --git a/default_images/presenter/BorderToolbarTopLeft.png b/default_images/presenter/BorderToolbarTopLeft.png
new file mode 100644
index 0000000..978e98a
Binary files /dev/null and b/default_images/presenter/BorderToolbarTopLeft.png differ
diff --git a/default_images/presenter/BorderToolbarTopRight.png b/default_images/presenter/BorderToolbarTopRight.png
new file mode 100644
index 0000000..7dc3d98
Binary files /dev/null and b/default_images/presenter/BorderToolbarTopRight.png differ
diff --git a/default_images/presenter/BorderTop.png b/default_images/presenter/BorderTop.png
new file mode 100644
index 0000000..dee68e8
Binary files /dev/null and b/default_images/presenter/BorderTop.png differ
diff --git a/default_images/presenter/BorderTopLeft.png b/default_images/presenter/BorderTopLeft.png
new file mode 100644
index 0000000..bbec4e4
Binary files /dev/null and b/default_images/presenter/BorderTopLeft.png differ
diff --git a/default_images/presenter/BorderTopRight.png b/default_images/presenter/BorderTopRight.png
new file mode 100644
index 0000000..3416b16
Binary files /dev/null and b/default_images/presenter/BorderTopRight.png differ
diff --git a/default_images/presenter/ButtonEffectNextDisabled.png b/default_images/presenter/ButtonEffectNextDisabled.png
new file mode 100644
index 0000000..5417cf7
Binary files /dev/null and b/default_images/presenter/ButtonEffectNextDisabled.png differ
diff --git a/default_images/presenter/ButtonEffectNextMouseOver.png b/default_images/presenter/ButtonEffectNextMouseOver.png
new file mode 100644
index 0000000..96805e3
Binary files /dev/null and b/default_images/presenter/ButtonEffectNextMouseOver.png differ
diff --git a/default_images/presenter/ButtonEffectNextNormal.png b/default_images/presenter/ButtonEffectNextNormal.png
new file mode 100644
index 0000000..6dbd732
Binary files /dev/null and b/default_images/presenter/ButtonEffectNextNormal.png differ
diff --git a/default_images/presenter/ButtonEffectNextSelected.png b/default_images/presenter/ButtonEffectNextSelected.png
new file mode 100644
index 0000000..eb6e6d4
Binary files /dev/null and b/default_images/presenter/ButtonEffectNextSelected.png differ
diff --git a/default_images/presenter/ButtonFrameCenterMouseOver.png b/default_images/presenter/ButtonFrameCenterMouseOver.png
new file mode 100644
index 0000000..b97799f
Binary files /dev/null and b/default_images/presenter/ButtonFrameCenterMouseOver.png differ
diff --git a/default_images/presenter/ButtonFrameCenterNormal.png b/default_images/presenter/ButtonFrameCenterNormal.png
new file mode 100644
index 0000000..4cf7218
Binary files /dev/null and b/default_images/presenter/ButtonFrameCenterNormal.png differ
diff --git a/default_images/presenter/ButtonFrameLeftMouseOver.png b/default_images/presenter/ButtonFrameLeftMouseOver.png
new file mode 100644
index 0000000..1f2ab6a
Binary files /dev/null and b/default_images/presenter/ButtonFrameLeftMouseOver.png differ
diff --git a/default_images/presenter/ButtonFrameLeftNormal.png b/default_images/presenter/ButtonFrameLeftNormal.png
new file mode 100644
index 0000000..0e92cb3
Binary files /dev/null and b/default_images/presenter/ButtonFrameLeftNormal.png differ
diff --git a/default_images/presenter/ButtonFrameRightMouseOver.png b/default_images/presenter/ButtonFrameRightMouseOver.png
new file mode 100644
index 0000000..0f49ad4
Binary files /dev/null and b/default_images/presenter/ButtonFrameRightMouseOver.png differ
diff --git a/default_images/presenter/ButtonFrameRightNormal.png b/default_images/presenter/ButtonFrameRightNormal.png
new file mode 100644
index 0000000..4ca6967
Binary files /dev/null and b/default_images/presenter/ButtonFrameRightNormal.png differ
diff --git a/default_images/presenter/ButtonHelpDisabled.png b/default_images/presenter/ButtonHelpDisabled.png
new file mode 100644
index 0000000..12f4903
Binary files /dev/null and b/default_images/presenter/ButtonHelpDisabled.png differ
diff --git a/default_images/presenter/ButtonHelpMouseOver.png b/default_images/presenter/ButtonHelpMouseOver.png
new file mode 100644
index 0000000..7bddef5
Binary files /dev/null and b/default_images/presenter/ButtonHelpMouseOver.png differ
diff --git a/default_images/presenter/ButtonHelpNormal.png b/default_images/presenter/ButtonHelpNormal.png
new file mode 100644
index 0000000..99c6932
Binary files /dev/null and b/default_images/presenter/ButtonHelpNormal.png differ
diff --git a/default_images/presenter/ButtonHelpSelected.png b/default_images/presenter/ButtonHelpSelected.png
new file mode 100644
index 0000000..f162db2
Binary files /dev/null and b/default_images/presenter/ButtonHelpSelected.png differ
diff --git a/default_images/presenter/ButtonMinusDisabled.png b/default_images/presenter/ButtonMinusDisabled.png
new file mode 100644
index 0000000..ff61106
Binary files /dev/null and b/default_images/presenter/ButtonMinusDisabled.png differ
diff --git a/default_images/presenter/ButtonMinusMouseOver.png b/default_images/presenter/ButtonMinusMouseOver.png
new file mode 100644
index 0000000..7872499
Binary files /dev/null and b/default_images/presenter/ButtonMinusMouseOver.png differ
diff --git a/default_images/presenter/ButtonMinusNormal.png b/default_images/presenter/ButtonMinusNormal.png
new file mode 100644
index 0000000..e2d9933
Binary files /dev/null and b/default_images/presenter/ButtonMinusNormal.png differ
diff --git a/default_images/presenter/ButtonMinusSelected.png b/default_images/presenter/ButtonMinusSelected.png
new file mode 100644
index 0000000..5d15de3
Binary files /dev/null and b/default_images/presenter/ButtonMinusSelected.png differ
diff --git a/default_images/presenter/ButtonNotesDisabled.png b/default_images/presenter/ButtonNotesDisabled.png
new file mode 100644
index 0000000..09e31d2
Binary files /dev/null and b/default_images/presenter/ButtonNotesDisabled.png differ
diff --git a/default_images/presenter/ButtonNotesMouseOver.png b/default_images/presenter/ButtonNotesMouseOver.png
new file mode 100644
index 0000000..099d6bf
Binary files /dev/null and b/default_images/presenter/ButtonNotesMouseOver.png differ
diff --git a/default_images/presenter/ButtonNotesNormal.png b/default_images/presenter/ButtonNotesNormal.png
new file mode 100644
index 0000000..5513926
Binary files /dev/null and b/default_images/presenter/ButtonNotesNormal.png differ
diff --git a/default_images/presenter/ButtonNotesSelected.png b/default_images/presenter/ButtonNotesSelected.png
new file mode 100644
index 0000000..f5494fb
Binary files /dev/null and b/default_images/presenter/ButtonNotesSelected.png differ
diff --git a/default_images/presenter/ButtonPlusDisabled.png b/default_images/presenter/ButtonPlusDisabled.png
new file mode 100644
index 0000000..e6ba3f3
Binary files /dev/null and b/default_images/presenter/ButtonPlusDisabled.png differ
diff --git a/default_images/presenter/ButtonPlusMouseOver.png b/default_images/presenter/ButtonPlusMouseOver.png
new file mode 100644
index 0000000..9d21dc4
Binary files /dev/null and b/default_images/presenter/ButtonPlusMouseOver.png differ
diff --git a/default_images/presenter/ButtonPlusNormal.png b/default_images/presenter/ButtonPlusNormal.png
new file mode 100644
index 0000000..2e075c2
Binary files /dev/null and b/default_images/presenter/ButtonPlusNormal.png differ
diff --git a/default_images/presenter/ButtonPlusSelected.png b/default_images/presenter/ButtonPlusSelected.png
new file mode 100644
index 0000000..b9d6fe1
Binary files /dev/null and b/default_images/presenter/ButtonPlusSelected.png differ
diff --git a/default_images/presenter/ButtonSlideNextDisabled.png b/default_images/presenter/ButtonSlideNextDisabled.png
new file mode 100644
index 0000000..7f3bce0
Binary files /dev/null and b/default_images/presenter/ButtonSlideNextDisabled.png differ
diff --git a/default_images/presenter/ButtonSlideNextMouseOver.png b/default_images/presenter/ButtonSlideNextMouseOver.png
new file mode 100644
index 0000000..4dc1365
Binary files /dev/null and b/default_images/presenter/ButtonSlideNextMouseOver.png differ
diff --git a/default_images/presenter/ButtonSlideNextNormal.png b/default_images/presenter/ButtonSlideNextNormal.png
new file mode 100644
index 0000000..711b8ca
Binary files /dev/null and b/default_images/presenter/ButtonSlideNextNormal.png differ
diff --git a/default_images/presenter/ButtonSlidePreviousDisabled.png b/default_images/presenter/ButtonSlidePreviousDisabled.png
new file mode 100644
index 0000000..383780e
Binary files /dev/null and b/default_images/presenter/ButtonSlidePreviousDisabled.png differ
diff --git a/default_images/presenter/ButtonSlidePreviousMouseOver.png b/default_images/presenter/ButtonSlidePreviousMouseOver.png
new file mode 100644
index 0000000..dc35c62
Binary files /dev/null and b/default_images/presenter/ButtonSlidePreviousMouseOver.png differ
diff --git a/default_images/presenter/ButtonSlidePreviousNormal.png b/default_images/presenter/ButtonSlidePreviousNormal.png
new file mode 100644
index 0000000..26262b4
Binary files /dev/null and b/default_images/presenter/ButtonSlidePreviousNormal.png differ
diff --git a/default_images/presenter/ButtonSlidePreviousSelected.png b/default_images/presenter/ButtonSlidePreviousSelected.png
new file mode 100644
index 0000000..7274263
Binary files /dev/null and b/default_images/presenter/ButtonSlidePreviousSelected.png differ
diff --git a/default_images/presenter/ButtonSlideSorterDisabled.png b/default_images/presenter/ButtonSlideSorterDisabled.png
new file mode 100644
index 0000000..ce7d4ad
Binary files /dev/null and b/default_images/presenter/ButtonSlideSorterDisabled.png differ
diff --git a/default_images/presenter/ButtonSlideSorterMouseOver.png b/default_images/presenter/ButtonSlideSorterMouseOver.png
new file mode 100644
index 0000000..2e7f518
Binary files /dev/null and b/default_images/presenter/ButtonSlideSorterMouseOver.png differ
diff --git a/default_images/presenter/ButtonSlideSorterNormal.png b/default_images/presenter/ButtonSlideSorterNormal.png
new file mode 100644
index 0000000..7aa914f
Binary files /dev/null and b/default_images/presenter/ButtonSlideSorterNormal.png differ
diff --git a/default_images/presenter/ButtonSlideSorterSelected.png b/default_images/presenter/ButtonSlideSorterSelected.png
new file mode 100644
index 0000000..143f995
Binary files /dev/null and b/default_images/presenter/ButtonSlideSorterSelected.png differ
diff --git a/default_images/presenter/LabelMouseOverCenter.png b/default_images/presenter/LabelMouseOverCenter.png
new file mode 100644
index 0000000..6eb75d3
Binary files /dev/null and b/default_images/presenter/LabelMouseOverCenter.png differ
diff --git a/default_images/presenter/LabelMouseOverLeft.png b/default_images/presenter/LabelMouseOverLeft.png
new file mode 100644
index 0000000..9455246
Binary files /dev/null and b/default_images/presenter/LabelMouseOverLeft.png differ
diff --git a/default_images/presenter/LabelMouseOverRight.png b/default_images/presenter/LabelMouseOverRight.png
new file mode 100644
index 0000000..1f972d0
Binary files /dev/null and b/default_images/presenter/LabelMouseOverRight.png differ
diff --git a/default_images/presenter/ScrollbarArrowDownDisabled.png b/default_images/presenter/ScrollbarArrowDownDisabled.png
new file mode 100644
index 0000000..4dd1627
Binary files /dev/null and b/default_images/presenter/ScrollbarArrowDownDisabled.png differ
diff --git a/default_images/presenter/ScrollbarArrowDownMouseOver.png b/default_images/presenter/ScrollbarArrowDownMouseOver.png
new file mode 100644
index 0000000..d1980a2
Binary files /dev/null and b/default_images/presenter/ScrollbarArrowDownMouseOver.png differ
diff --git a/default_images/presenter/ScrollbarArrowDownNormal.png b/default_images/presenter/ScrollbarArrowDownNormal.png
new file mode 100644
index 0000000..166f100
Binary files /dev/null and b/default_images/presenter/ScrollbarArrowDownNormal.png differ
diff --git a/default_images/presenter/ScrollbarArrowDownSelected.png b/default_images/presenter/ScrollbarArrowDownSelected.png
new file mode 100644
index 0000000..21d4294
Binary files /dev/null and b/default_images/presenter/ScrollbarArrowDownSelected.png differ
diff --git a/default_images/presenter/ScrollbarArrowUpDisabled.png b/default_images/presenter/ScrollbarArrowUpDisabled.png
new file mode 100644
index 0000000..44f6068
Binary files /dev/null and b/default_images/presenter/ScrollbarArrowUpDisabled.png differ
diff --git a/default_images/presenter/ScrollbarArrowUpMouseOver.png b/default_images/presenter/ScrollbarArrowUpMouseOver.png
new file mode 100644
index 0000000..9795885
Binary files /dev/null and b/default_images/presenter/ScrollbarArrowUpMouseOver.png differ
diff --git a/default_images/presenter/ScrollbarArrowUpNormal.png b/default_images/presenter/ScrollbarArrowUpNormal.png
new file mode 100644
index 0000000..804ced8
Binary files /dev/null and b/default_images/presenter/ScrollbarArrowUpNormal.png differ
diff --git a/default_images/presenter/ScrollbarArrowUpSelected.png b/default_images/presenter/ScrollbarArrowUpSelected.png
new file mode 100644
index 0000000..d7be4f3
Binary files /dev/null and b/default_images/presenter/ScrollbarArrowUpSelected.png differ
diff --git a/default_images/presenter/ScrollbarPagerMiddleMouseOver.png b/default_images/presenter/ScrollbarPagerMiddleMouseOver.png
new file mode 100644
index 0000000..84b781a
Binary files /dev/null and b/default_images/presenter/ScrollbarPagerMiddleMouseOver.png differ
diff --git a/default_images/presenter/ScrollbarPagerMiddleNormal.png b/default_images/presenter/ScrollbarPagerMiddleNormal.png
new file mode 100644
index 0000000..a06ba66
Binary files /dev/null and b/default_images/presenter/ScrollbarPagerMiddleNormal.png differ
diff --git a/default_images/presenter/ScrollbarThumbBottomMouseOver.png b/default_images/presenter/ScrollbarThumbBottomMouseOver.png
new file mode 100644
index 0000000..482f136
Binary files /dev/null and b/default_images/presenter/ScrollbarThumbBottomMouseOver.png differ
diff --git a/default_images/presenter/ScrollbarThumbBottomNormal.png b/default_images/presenter/ScrollbarThumbBottomNormal.png
new file mode 100644
index 0000000..ec46e17
Binary files /dev/null and b/default_images/presenter/ScrollbarThumbBottomNormal.png differ
diff --git a/default_images/presenter/ScrollbarThumbMiddleMouseOver.png b/default_images/presenter/ScrollbarThumbMiddleMouseOver.png
new file mode 100644
index 0000000..62066c2
Binary files /dev/null and b/default_images/presenter/ScrollbarThumbMiddleMouseOver.png differ
diff --git a/default_images/presenter/ScrollbarThumbMiddleNormal.png b/default_images/presenter/ScrollbarThumbMiddleNormal.png
new file mode 100644
index 0000000..c25e4ed
Binary files /dev/null and b/default_images/presenter/ScrollbarThumbMiddleNormal.png differ
diff --git a/default_images/presenter/ScrollbarThumbTopMouseOver.png b/default_images/presenter/ScrollbarThumbTopMouseOver.png
new file mode 100644
index 0000000..714481d
Binary files /dev/null and b/default_images/presenter/ScrollbarThumbTopMouseOver.png differ
diff --git a/default_images/presenter/ScrollbarThumbTopNormal.png b/default_images/presenter/ScrollbarThumbTopNormal.png
new file mode 100644
index 0000000..7e0922c
Binary files /dev/null and b/default_images/presenter/ScrollbarThumbTopNormal.png differ
diff --git a/default_images/presenter/ViewBackground.png b/default_images/presenter/ViewBackground.png
new file mode 100644
index 0000000..ca52d82
Binary files /dev/null and b/default_images/presenter/ViewBackground.png differ
diff --git a/extensions.lst b/extensions.lst
index 4fde85c..a62f4f3 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -34,13 +34,13 @@
# Some extensions that are installed indepently of the language.
# the presenter console extension
-[ language=all && ENABLE_PRESENTER_SCREEN=YES ]
- file://presenter/presenter-screen.oxt
+# [ language=all && ENABLE_XXX ]
+# file://XXX.oxt
# English dictionary
[ language=en.* || language=de || language=it ]
b7ce02d25eb302e5b23572cdccaea461 http://numbertext.org/tmp/dict-en.oxt
-
+
# English (USA, en_US) dictionary
[ language==nl || language==ru ]
e2eab80772ab1aa09716954219351a80 http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt"
diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
new file mode 100644
index 0000000..74db3aa
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -0,0 +1,1220 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--***********************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
+<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.Office" oor:name="PresenterScreen">
+ <node oor:name="PresenterScreenSettings">
+ <node oor:name="ToolBars">
+ <node oor:name="ToolBar" oor:op="replace">
+ <node oor:name="Entries">
+ <node oor:name="a" oor:op="replace">
+ <prop oor:name="Name"><value>PreviousSlide</value></prop>
+ <prop oor:name="Type"><value>Button</value></prop>
+ <node oor:name="Normal">
+ <prop oor:name="Text"><value xml:lang="en-US">Previous</value></prop>
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousNormal.png</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:PrevSlide</value></prop>
+ <node oor:name="Font">
+ <prop oor:name="Size"><value>12</value></prop>
+ <prop oor:name="Style"><value>Bold</value></prop>
+ <prop oor:name="Color"><value>B3B7BC</value></prop>
+ <prop oor:name="Anchor"><value>Center</value></prop>
+ </node>
+ </node>
+ <node oor:name="MouseOver">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousMouseOver.png</value></prop>
+ </node>
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>FFFFFF</value></prop>
+ </node>
+ </node>
+ <node oor:name="Disabled">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousDisabled.png</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="b" oor:op="replace">
+ <prop oor:name="Name"><value>NextEffect</value></prop>
+ <prop oor:name="Type"><value>Button</value></prop>
+ <node oor:name="Normal">
+ <prop oor:name="Text"><value xml:lang="en-US">Next</value></prop>
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextNormal.png</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:NextEffect</value></prop>
+ <node oor:name="Font">
+ <prop oor:name="Size"><value>12</value></prop>
+ <prop oor:name="Style"><value>Bold</value></prop>
+ <prop oor:name="Color"><value>B3B7BC</value></prop>
+ <prop oor:name="Anchor"><value>Center</value></prop>
+ </node>
+ </node>
+ <node oor:name="MouseOver">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextMouseOver.png</value></prop>
+ </node>
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>FFFFFF</value></prop>
+ </node>
+ </node>
+ <node oor:name="Disabled">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextDisabled.png</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="c" oor:op="replace">
+ <prop oor:name="Name"><value>Notes</value></prop>
+ <prop oor:name="Type"><value>Button</value></prop>
+ <node oor:name="Normal">
+ <prop oor:name="Text"><value xml:lang="en-US">Notes</value></prop>
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesNormal.png</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowNotes</value></prop>
+ <node oor:name="Font">
+ <prop oor:name="Size"><value>12</value></prop>
+ <prop oor:name="Style"><value>Bold</value></prop>
+ <prop oor:name="Color"><value>B3B7BC</value></prop>
+ <prop oor:name="Anchor"><value>Center</value></prop>
+ </node>
+ </node>
+ <node oor:name="MouseOver">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesMouseOver.png</value></prop>
+ </node>
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>FFFFFF</value></prop>
+ </node>
+ </node>
+ <node oor:name="Selected">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesSelected.png</value></prop>
+ </node>
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>FFFFFF</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseNotes</value></prop>
+ </node>
+ <node oor:name="Disabled">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesDisabled.png</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="d" oor:op="replace">
+ <prop oor:name="Name"><value>SlideSorter</value></prop>
+ <prop oor:name="Type"><value>Button</value></prop>
+ <node oor:name="Normal">
+ <prop oor:name="Text"><value xml:lang="en-US">Slides</value></prop>
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterNormal.png</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter</value></prop>
+ <node oor:name="Font">
+ <prop oor:name="Size"><value>12</value></prop>
+ <prop oor:name="Style"><value>Bold</value></prop>
+ <prop oor:name="Color"><value>B3B7BC</value></prop>
+ <prop oor:name="Anchor"><value>Center</value></prop>
+ </node>
+ </node>
+ <node oor:name="MouseOver">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterMouseOver.png</value></prop>
+ </node>
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>FFFFFF</value></prop>
+ </node>
+ </node>
+ <node oor:name="Selected">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterSelected.png</value></prop>
+ </node>
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>FFFFFF</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter</value></prop>
+ </node>
+ <node oor:name="Disabled">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterDisabled.png</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="e" oor:op="replace">
+ <prop oor:name="Type"><value>VerticalSeparator</value></prop>
+ <node oor:name="Normal">
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>76797C</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="f" oor:op="replace">
+ <prop oor:name="Type"><value>ChangeOrientation</value></prop>
+ </node>
+ <node oor:name="g" oor:op="replace">
+ <prop oor:name="Type"><value>CurrentTimeLabel</value></prop>
+ <node oor:name="Normal">
+ <node oor:name="Font">
+ <prop oor:name="Size"><value>18</value></prop>
+ <prop oor:name="Style"><value>Bold</value></prop>
+ <prop oor:name="Color"><value>ffffff</value></prop>
+ <prop oor:name="Anchor"><value>Center</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="h" oor:op="replace">
+ <prop oor:name="Type"><value>HorizontalSeparator</value></prop>
+ <node oor:name="Normal">
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>71767a</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="i" oor:op="replace">
+ <prop oor:name="Type"><value>PresentationTimeLabel</value></prop>
+ <node oor:name="Normal">
+ <node oor:name="Font">
+ <prop oor:name="Size"><value>26</value></prop>
+ <prop oor:name="Style"><value>Bold</value></prop>
+ <prop oor:name="Color"><value>ffe969</value></prop>
+ <prop oor:name="Anchor"><value>Center</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="j" oor:op="replace">
+ <prop oor:name="Type"><value>ChangeOrientation</value></prop>
+ </node>
+ <node oor:name="k" oor:op="replace">
+ <prop oor:name="Type"><value>VerticalSeparator</value></prop>
+ <node oor:name="Normal">
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>76797C</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="l" oor:op="replace">
+ <prop oor:name="Name"><value>Help</value></prop>
+ <prop oor:name="Type"><value>Button</value></prop>
+ <node oor:name="Normal">
+ <prop oor:name="Text"><value xml:lang="en-US">Help</value></prop>
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpNormal.png</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowHelp</value></prop>
+ <node oor:name="Font">
+ <prop oor:name="Size"><value>12</value></prop>
+ <prop oor:name="Style"><value>Bold</value></prop>
+ <prop oor:name="Color"><value>B3B7BC</value></prop>
+ <prop oor:name="Anchor"><value>Center</value></prop>
+ </node>
+ </node>
+ <node oor:name="MouseOver">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpMouseOver.png</value></prop>
+ </node>
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>FFFFFF</value></prop>
+ </node>
+ </node>
+ <node oor:name="Selected">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpSelected.png</value></prop>
+ </node>
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>FFFFFF</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseHelp</value></prop>
+ </node>
+ <node oor:name="Disabled">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpDisabled.png</value></prop>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ <node oor:name="NotesToolBar" oor:op="replace">
+ <node oor:name="Entries">
+ <node oor:name="a" oor:op="replace">
+ <prop oor:name="Name"><value>Zoom</value></prop>
+ <prop oor:name="Type"><value>Label</value></prop>
+ <node oor:name="Normal">
+ <prop oor:name="Text"><value xml:lang="en-US">Zoom</value></prop>
+ <node oor:name="Font">
+ <prop oor:name="Size"><value>14</value></prop>
+ <prop oor:name="Style"><value>Bold</value></prop>
+ <prop oor:name="Color"><value>B3B7BC</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="b" oor:op="replace">
+ <prop oor:name="Name"><value>Grow</value></prop>
+ <prop oor:name="Type"><value>Button</value></prop>
+ <node oor:name="Normal">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonPlusNormal.png</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:GrowNotesFont</value></prop>
+ </node>
+ <node oor:name="MouseOver">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonPlusMouseOver.png</value></prop>
+ </node>
+ </node>
+ <node oor:name="Disabled">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonPlusDisabled.png</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="c" oor:op="replace">
+ <prop oor:name="Name"><value>Shrink</value></prop>
+ <prop oor:name="Type"><value>Button</value></prop>
+ <node oor:name="Normal">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonMinusNormal.png</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShrinkNotesFont</value></prop>
+ </node>
+ <node oor:name="MouseOver">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonMinusMouseOver.png</value></prop>
+ </node>
+ </node>
+ <node oor:name="Disabled">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonMinusDisabled.png</value></prop>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ <node oor:name="Buttons">
+ <node oor:name="SlideSorterCloser" oor:op="replace">
+ <prop oor:name="Name"><value>SlideSorterCloser</value></prop>
+ <prop oor:name="Text">
+ <value xml:lang="en-US">Close</value>
+ </prop>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter</value></prop>
+ </node>
+ <node oor:name="NotesViewCloser" oor:op="replace">
+ <prop oor:name="Name"><value>NotesViewCloser</value></prop>
+ <prop oor:name="Text">
+ <value xml:lang="en-US">Close</value>
+ </prop>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseNotes</value></prop>
+ </node>
+ <node oor:name="HelpViewCloser" oor:op="replace">
+ <prop oor:name="Name"><value>HelpViewCloser</value></prop>
+ <prop oor:name="Text">
+ <value xml:lang="en-US">Close</value>
+ </prop>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseHelp</value></prop>
+ </node>
+ </node>
+ <node oor:name="ScrollBar">
+ <node oor:name="Bitmaps">
+ <node oor:name="up" oor:op="replace">
+ <prop oor:name="Name"><value>Up</value></prop>
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarArrowUpNormal.png</value></prop>
+ <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarArrowUpMouseOver.png</value></prop>
+ <prop oor:name="DisabledFileName"><value>private:graphicrepository/presenter/ScrollbarArrowUpDisabled.png</value></prop>
+ </node>
+ <node oor:name="down" oor:op="replace">
+ <prop oor:name="Name"><value>Down</value></prop>
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarArrowDownNormal.png</value></prop>
+ <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarArrowDownMouseOver.png</value></prop>
+ <prop oor:name="DisabledFileName"><value>private:graphicrepository/presenter/ScrollbarArrowDownDisabled.png</value></prop>
+ </node>
+ <node oor:name="pagervertical" oor:op="replace">
+ <prop oor:name="Name"><value>PagerVertical</value></prop>
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarPagerMiddleNormal.png</value></prop>
+ <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarPagerMiddleMouseOver.png</value></prop>
+ </node>
+ <node oor:name="thumbtop" oor:op="replace">
+ <prop oor:name="Name"><value>ThumbTop</value></prop>
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarThumbTopNormal.png</value></prop>
+ <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarThumbTopMouseOver.png</value></prop>
+ </node>
+ <node oor:name="thumbbottom" oor:op="replace">
+ <prop oor:name="Name"><value>ThumbBottom</value></prop>
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarThumbBottomNormal.png</value></prop>
+ <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarThumbBottomMouseOver.png</value></prop>
+ </node>
+ <node oor:name="thumbvertical" oor:op="replace">
+ <prop oor:name="Name"><value>ThumbVertical</value></prop>
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarThumbMiddleNormal.png</value></prop>
+ <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarThumbMiddleMouseOver.png</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="SlideSorter">
+ <node oor:name="BorderSize">
+ <prop oor:name="Left"><value>9</value></prop>
+ <prop oor:name="Top"><value>9</value></prop>
+ <prop oor:name="Right"><value>9</value></prop>
+ <prop oor:name="Bottom"><value>9</value></prop>
+ </node>
+ <node oor:name="CurrentSlideBorderBitmaps">
+ <node oor:name="TopLeft" oor:op="replace">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideTopLeft.png</value></prop>
+ </node>
+ <node oor:name="Top" oor:op="replace">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideTop.png</value></prop>
+ </node>
+ <node oor:name="TopRight" oor:op="replace">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideTopRight.png</value></prop>
+ </node>
+ <node oor:name="Left" oor:op="replace">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideLeft.png</value></prop>
+ </node>
+ <node oor:name="Right" oor:op="replace">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideRight.png</value></prop>
+ </node>
+ <node oor:name="BottomLeft" oor:op="replace">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideBottomLeft.png</value></prop>
+ </node>
+ <node oor:name="Bottom" oor:op="replace">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideBottom.png</value></prop>
+ </node>
+ <node oor:name="BottomRight" oor:op="replace">
+ <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideBottomRight.png</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="HelpView">
+ <node oor:name="HelpStrings">
+ <node oor:name="a" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">Left click, right or down arrow, spacebar, page down, enter, return, 'N'</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Next slide, or next effect</value>
+ </prop>
+ </node>
+ <node oor:name="b" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">Right click, left or up arrow, page up, backspace, 'P'</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Previous slide, or previous effect</value>
+ </prop>
+ </node>
+ <node oor:name="c" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ </node>
+ <node oor:name="d" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">Home</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">First slide</value>
+ </prop>
+ </node>
+ <node oor:name="e" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">End</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Last slide</value>
+ </prop>
+ </node>
+ <node oor:name="f" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ </node>
+ <node oor:name="g" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">Alt-Page Up</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Previous slide without effects</value>
+ </prop>
+ </node>
+ <node oor:name="h" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">Alt-Page Down</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Next slide without effects</value>
+ </prop>
+ </node>
+ <node oor:name="i" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ </node>
+ <node oor:name="j" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">'B', '.'</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Blacks/Unblacks the screen</value>
+ </prop>
+ </node>
+ <node oor:name="k" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">'W', ','</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Whites/Unwhites the screen</value>
+ </prop>
+ </node>
+ <node oor:name="l" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ </node>
+ <node oor:name="m" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">Esc, '-'</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">End slide show</value>
+ </prop>
+ </node>
+ <node oor:name="n" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ </node>
+ <node oor:name="o" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">Number followed by Enter</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Go to that slide</value>
+ </prop>
+ </node>
+ <node oor:name="p" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US"> </value>
+ </prop>
+ </node>
+ <node oor:name="q" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">'G', 'S'</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Grow/Shrink size of notes font</value>
+ </prop>
+ </node>
+ <node oor:name="r" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">'A', 'Z'</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Scroll notes up/down</value>
+ </prop>
+ </node>
+ <node oor:name="s" oor:op="replace">
+ <prop oor:name="Left">
+ <value xml:lang="en-US">'H', 'L'</value>
+ </prop>
+ <prop oor:name="Right">
+ <value xml:lang="en-US">Move caret in notes view backward/forward</value>
+ </prop>
+ </node>
+ <node oor:name="t" oor:op="replace">
+ <prop oor:name="Left">
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list