You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2014/03/19 11:15:07 UTC
svn commit: r1579184 [17/33] - in /openoffice/branches/alg_writerframes: ./
ext_sources/ extras/l10n/source/de/ extras/l10n/source/es/
extras/l10n/source/eu/ extras/l10n/source/hi/ extras/l10n/source/kk/
extras/l10n/source/lt/ extras/l10n/source/nb/ ex...
Modified: openoffice/branches/alg_writerframes/main/cui/source/options/optgdlg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/options/optgdlg.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/options/optgdlg.src (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/options/optgdlg.src Wed Mar 19 10:14:42 2014
@@ -211,8 +211,7 @@ TabPage OFA_TP_VIEW
First = 80 ;
Last = 130 ;
SpinSize = 1 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
};
FixedText FT_ICONSIZESTYLE
{
@@ -448,8 +447,7 @@ TabPage OFA_TP_VIEW
First = 10 ;
Last = 90 ;
SpinSize = 5 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText [ en-US ] = "%" ;
+ Unit = FUNIT_PERCENT ;
};
};
// *******************************************************************
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/autocdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/autocdlg.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/autocdlg.cxx (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/autocdlg.cxx Wed Mar 19 10:14:42 2014
@@ -753,7 +753,7 @@ void OfaSwAutoFmtOptionsPage::Reset( con
nPercent = pOpt->nRightMargin;
sMargin = ' ';
sMargin += String::CreateFromInt32( nPercent );
- sMargin += '%';
+ sMargin.AppendAscii( " %" );
pUserData = new ImpUserData(&sMargin, 0);
aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
@@ -817,7 +817,7 @@ IMPL_LINK(OfaSwAutoFmtOptionsPage, EditH
nPercent = (sal_uInt16)aDlg.GetPrcntFld().GetValue();
sMargin = ' ';
sMargin += String::CreateFromInt32( nPercent );
- sMargin += '%';
+ sMargin.AppendAscii( " %" );
}
}
aCheckLB.Invalidate();
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/autocdlg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/autocdlg.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/autocdlg.src (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/autocdlg.src Wed Mar 19 10:14:42 2014
@@ -280,8 +280,7 @@ ModalDialog RID_OFADLG_PRCNT_SET
Spin = TRUE ;
Maximum = 100 ;
Value = 77 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
First = 10 ;
Last = 100 ;
SpinSize = 5 ;
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/backgrnd.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/backgrnd.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/backgrnd.src (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/backgrnd.src Wed Mar 19 10:14:42 2014
@@ -148,8 +148,7 @@ TabPage RID_SVXPAGE_BACKGROUND
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
SpinSize = 5 ;
Minimum = 0;
Maximum = 100;
@@ -245,8 +244,7 @@ TabPage RID_SVXPAGE_BACKGROUND
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
SpinSize = 5 ;
Minimum = 0;
Maximum = 100;
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/chardlg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/chardlg.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/chardlg.src (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/chardlg.src Wed Mar 19 10:14:42 2014
@@ -747,8 +747,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Spin = TRUE ;
Minimum = 1 ;
Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;
@@ -778,8 +777,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Spin = TRUE ;
Minimum = 1 ;
Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;
@@ -845,8 +843,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Spin = TRUE ;
Minimum = 1 ;
Maximum = 999 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
First = 50 ;
Last = 200 ;
SpinSize = 1 ;
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/grfpage.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/grfpage.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/grfpage.src (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/grfpage.src Wed Mar 19 10:14:42 2014
@@ -197,8 +197,7 @@ TabPage RID_SVXPAGE_GRFCROP
Last = 1000 ;
Maximum = 9999 ;
Value = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
SpinSize = 10 ;
};
FixedText FT_HEIGHTZOOM
@@ -224,8 +223,7 @@ TabPage RID_SVXPAGE_GRFCROP
Last = 1000 ;
Maximum = 9999 ;
Value = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
SpinSize = 10 ;
};
FixedLine FL_SIZE
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/numpages.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/numpages.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/numpages.src (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/numpages.src Wed Mar 19 10:14:42 2014
@@ -296,8 +296,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
SpinSize = 1 ;
Minimum = 1;
Maximum = 250;
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/paragrph.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/paragrph.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/paragrph.src (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/paragrph.src Wed Mar 19 10:14:42 2014
@@ -212,8 +212,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
Minimum = 50 ;
Maximum = 200 ;
Value = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
First = 50 ;
Last = 200 ;
SpinSize = 1 ;
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/tabarea.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/tabarea.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/tabarea.src (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/tabarea.src Wed Mar 19 10:14:42 2014
@@ -70,8 +70,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -123,8 +122,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -145,8 +143,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -188,8 +185,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -210,8 +206,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -232,8 +227,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -428,7 +422,6 @@ TabPage RID_SVXPAGE_AREA
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
- CustomUnitText = "%" ;
Minimum = 5 ;
Maximum = 100 ;
First = 5 ;
@@ -453,7 +446,6 @@ TabPage RID_SVXPAGE_AREA
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
- CustomUnitText = "%" ;
Minimum = 5 ;
Maximum = 100 ;
First = 5 ;
@@ -497,8 +489,7 @@ TabPage RID_SVXPAGE_AREA
Repeat = TRUE ;
Spin = TRUE ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Maximum = 100 ;
Last = 100 ;
SpinSize = 5 ;
@@ -514,8 +505,7 @@ TabPage RID_SVXPAGE_AREA
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -566,8 +556,7 @@ TabPage RID_SVXPAGE_AREA
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -673,8 +662,7 @@ TabPage RID_SVXPAGE_SHADOW
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -1056,8 +1044,7 @@ TabPage RID_SVXPAGE_GRADIENT
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -1078,8 +1065,7 @@ TabPage RID_SVXPAGE_GRADIENT
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -1121,8 +1107,7 @@ TabPage RID_SVXPAGE_GRADIENT
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -1153,8 +1138,7 @@ TabPage RID_SVXPAGE_GRADIENT
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -1185,8 +1169,7 @@ TabPage RID_SVXPAGE_GRADIENT
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -1365,8 +1348,7 @@ TabPage RID_SVXPAGE_COLOR
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
};
FixedText FT_2
@@ -1385,8 +1367,7 @@ TabPage RID_SVXPAGE_COLOR
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
};
FixedText FT_3
@@ -1405,8 +1386,7 @@ TabPage RID_SVXPAGE_COLOR
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
};
FixedText FT_4
@@ -1425,8 +1405,7 @@ TabPage RID_SVXPAGE_COLOR
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
};
PushButton BTN_ADD
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/tabline.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/tabline.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/tabline.src (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/tabline.src Wed Mar 19 10:14:42 2014
@@ -116,8 +116,7 @@ TabPage RID_SVXPAGE_LINE
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
+ Unit = FUNIT_PERCENT ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -541,7 +540,6 @@ TabPage RID_SVXPAGE_LINE_DEF
DecimalDigits = 2 ;
Value = 1 ;
Unit = FUNIT_MM ;
- CustomUnitText = " %" ;
SpinSize = 10 ;
};
MetricField MTR_FLD_LENGTH_2
@@ -562,7 +560,6 @@ TabPage RID_SVXPAGE_LINE_DEF
DecimalDigits = 2 ;
Value = 1 ;
Unit = FUNIT_MM ;
- CustomUnitText = " %" ;
SpinSize = 10 ;
};
FixedText FT_DISTANCE
@@ -586,7 +583,6 @@ TabPage RID_SVXPAGE_LINE_DEF
DecimalDigits = 2 ;
Value = 1 ;
Unit = FUNIT_MM ;
- CustomUnitText = " %" ;
Last = 5000 ;
SpinSize = 10 ;
};
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx Wed Mar 19 10:14:42 2014
@@ -2705,13 +2705,13 @@ IMPL_LINK( SvxAreaTabPage, ClickScaleHdl
if( aTsbScale.GetState() == STATE_CHECK )
{
aMtrFldXSize.SetDecimalDigits( 0 );
- aMtrFldXSize.SetUnit( FUNIT_CUSTOM );
+ aMtrFldXSize.SetUnit( FUNIT_PERCENT );
aMtrFldXSize.SetValue( 100 );
aMtrFldXSize.SetMax( 100 );
aMtrFldXSize.SetLast( 100 );
aMtrFldYSize.SetDecimalDigits( 0 );
- aMtrFldYSize.SetUnit( FUNIT_CUSTOM );
+ aMtrFldYSize.SetUnit( FUNIT_PERCENT );
aMtrFldYSize.SetValue( 100 );
aMtrFldYSize.SetMax( 100 );
aMtrFldYSize.SetLast( 100 );
Modified: openoffice/branches/alg_writerframes/main/cui/source/tabpages/tplnedef.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/tplnedef.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/tplnedef.cxx (original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/tplnedef.cxx Wed Mar 19 10:14:42 2014
@@ -508,7 +508,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetr
SetMetricValue( aMtrLength2, nTmp2, ePoolUnit );
SetMetricValue( aMtrDistance, nTmp3, ePoolUnit );
}
- else if( aCbxSynchronize.IsChecked() && aMtrLength1.GetUnit() != FUNIT_CUSTOM )
+ else if( aCbxSynchronize.IsChecked() && aMtrLength1.GetUnit() != FUNIT_PERCENT )
{
long nTmp1, nTmp2, nTmp3;
@@ -530,9 +530,9 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetr
aMtrLength2.SetDecimalDigits( 0 );
aMtrDistance.SetDecimalDigits( 0 );
- aMtrLength1.SetUnit( FUNIT_CUSTOM );
- aMtrLength2.SetUnit( FUNIT_CUSTOM );
- aMtrDistance.SetUnit( FUNIT_CUSTOM );
+ aMtrLength1.SetUnit( FUNIT_PERCENT );
+ aMtrLength2.SetUnit( FUNIT_PERCENT );
+ aMtrDistance.SetUnit( FUNIT_PERCENT );
SetMetricValue( aMtrLength1, nTmp1, ePoolUnit );
Modified: openoffice/branches/alg_writerframes/main/dbaccess/source/ui/dlg/adminpages.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/dbaccess/source/ui/dlg/adminpages.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/dbaccess/source/ui/dlg/adminpages.hxx (original)
+++ openoffice/branches/alg_writerframes/main/dbaccess/source/ui/dlg/adminpages.hxx Wed Mar 19 10:14:42 2014
@@ -54,6 +54,7 @@ namespace dbaui
class SAL_NO_VTABLE ISaveValueWrapper
{
public:
+ virtual ~ISaveValueWrapper() {}
virtual bool SaveValue() = 0;
virtual bool Disable() = 0;
};
Modified: openoffice/branches/alg_writerframes/main/dbaccess/source/ui/misc/UITools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/dbaccess/source/ui/misc/UITools.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/dbaccess/source/ui/misc/UITools.cxx (original)
+++ openoffice/branches/alg_writerframes/main/dbaccess/source/ui/misc/UITools.cxx Wed Mar 19 10:14:42 2014
@@ -1577,22 +1577,22 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int
{
case DataType::TINYINT:
pTypeInfo = queryTypeInfoByType(DataType::SMALLINT,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
// run through
case DataType::SMALLINT:
pTypeInfo = queryTypeInfoByType(DataType::INTEGER,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
// run through
case DataType::INTEGER:
pTypeInfo = queryTypeInfoByType(DataType::FLOAT,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
// run through
case DataType::FLOAT:
pTypeInfo = queryTypeInfoByType(DataType::REAL,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
// run through
case DataType::DATE:
@@ -1600,7 +1600,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int
if( DataType::DATE == _nDataType || DataType::TIME == _nDataType )
{
pTypeInfo = queryTypeInfoByType(DataType::TIMESTAMP,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
}
// run through
@@ -1608,12 +1608,12 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int
case DataType::REAL:
case DataType::BIGINT:
pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
// run through
case DataType::DOUBLE:
pTypeInfo = queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
// run through
case DataType::NUMERIC:
@@ -1621,20 +1621,20 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int
break;
case DataType::DECIMAL:
pTypeInfo = queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
break;
case DataType::VARCHAR:
pTypeInfo = queryTypeInfoByType(DataType::LONGVARCHAR,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
break;
case DataType::LONGVARCHAR:
pTypeInfo = queryTypeInfoByType(DataType::CLOB,_rTypeInfo);
- if( pTypeInfo != NULL)
+ if( bool(pTypeInfo))
break;
break;
default:
Modified: openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/JoinController.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/JoinController.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/JoinController.cxx (original)
+++ openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/JoinController.cxx Wed Mar 19 10:14:42 2014
@@ -300,7 +300,7 @@ void OJoinController::SaveTabWinPosSize(
{
// die Daten zum Fenster
TTableWindowData::value_type pData = pTabWin->GetData();
- OSL_ENSURE(pData != NULL, "SaveTabWinPosSize : TabWin hat keine Daten !");
+ OSL_ENSURE( bool(pData), "SaveTabWinPosSize : TabWin hat keine Daten !");
// Position & Size der Daten neu setzen (aus den aktuellen Fenster-Parametern)
Point aPos = pTabWin->GetPosPixel();
Modified: openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/JoinTableView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/JoinTableView.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/JoinTableView.cxx (original)
+++ openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/JoinTableView.cxx Wed Mar 19 10:14:42 2014
@@ -1462,7 +1462,7 @@ long OJoinTableView::PreNotify(NotifyEve
// no conn for any reason -> select the next or previous tab win
if(bForward)
{
- if ((aIter->second == m_aTableMap.rbegin()->second))
+ if( aIter->second == m_aTableMap.rbegin()->second)
pNextWin = m_aTableMap.begin()->second;
else
{
Modified: openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/QueryTableView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/QueryTableView.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/QueryTableView.cxx (original)
+++ openoffice/branches/alg_writerframes/main/dbaccess/source/ui/querydesign/QueryTableView.cxx Wed Mar 19 10:14:42 2014
@@ -1011,7 +1011,7 @@ sal_Bool OQueryTableView::ShowTabWin( OQ
if (pTabWin->Init())
{
TTableWindowData::value_type pData = pTabWin->GetData();
- DBG_ASSERT(pData != NULL, "OQueryTableView::ShowTabWin : TabWin hat keine Daten !");
+ DBG_ASSERT( bool(pData), "OQueryTableView::ShowTabWin : TabWin hat keine Daten !");
// Wenn die Daten schon PosSize haben, diese benutzen
if (pData->HasPosition() && pData->HasSize())
{
Modified: openoffice/branches/alg_writerframes/main/dbaccess/source/ui/tabledesign/TEditControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/dbaccess/source/ui/tabledesign/TEditControl.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/dbaccess/source/ui/tabledesign/TEditControl.cxx (original)
+++ openoffice/branches/alg_writerframes/main/dbaccess/source/ui/tabledesign/TEditControl.cxx Wed Mar 19 10:14:42 2014
@@ -420,7 +420,7 @@ sal_Bool OTableEditorCtrl::SetDataPtr( l
if(nRow >= (long)m_pRowList->size())
return sal_False;
pActRow = (*m_pRowList)[nRow];
- return pActRow != NULL;
+ return bool(pActRow);
}
//------------------------------------------------------------------------------
Modified: openoffice/branches/alg_writerframes/main/default_images/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/default_images/introabout/intro.png?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/alg_writerframes/main/desktop/os2/source/applauncher/launcher.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/desktop/os2/source/applauncher/launcher.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/desktop/os2/source/applauncher/launcher.hxx (original)
+++ openoffice/branches/alg_writerframes/main/desktop/os2/source/applauncher/launcher.hxx Wed Mar 19 10:14:42 2014
@@ -24,7 +24,7 @@
#define INCL_PM
#include <os2.h>
-#define OFFICE_IMAGE_NAME ("soffice")
+#define OFFICE_IMAGE_NAME "soffice"
extern CHAR APPLICATION_SWITCH[];
Modified: openoffice/branches/alg_writerframes/main/desktop/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/desktop/prj/d.lst?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/desktop/prj/d.lst (original)
+++ openoffice/branches/alg_writerframes/main/desktop/prj/d.lst Wed Mar 19 10:14:42 2014
@@ -116,10 +116,12 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev
mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo
mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_nologo
+mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_beta
..\%__SRC%\bin\intro\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip
..\%__SRC%\bin\dev\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.zip
..\%__SRC%\bin\dev_nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo\intro.zip
..\%__SRC%\bin\nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_nologo\intro.zip
+..\%__SRC%\bin\beta\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_beta\intro.zip
..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe
Modified: openoffice/branches/alg_writerframes/main/desktop/scripts/unoinfo.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/desktop/scripts/unoinfo.sh?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/desktop/scripts/unoinfo.sh (original)
+++ openoffice/branches/alg_writerframes/main/desktop/scripts/unoinfo.sh Wed Mar 19 10:14:42 2014
@@ -40,7 +40,7 @@ java)
printf '0%s\0%s\0%s\0%s\0%s' \
"$sd_prog/classes/ridl.jar" \
"$sd_prog/classes/jurt.jar" \
- "$sd_prog/classes/java/juh.jar" \
+ "$sd_prog/classes/juh.jar" \
"$sd_prog/classes/unoil.jar" "$sd_prog"
;;
*)
Modified: openoffice/branches/alg_writerframes/main/desktop/zipintro/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/desktop/zipintro/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/desktop/zipintro/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/desktop/zipintro/makefile.mk Wed Mar 19 10:14:42 2014
@@ -29,7 +29,7 @@ TARGET=zipintro
.INCLUDE : settings.mk
-DEFAULT_FLAVOURS=dev dev_nologo nologo intro
+DEFAULT_FLAVOURS=dev dev_nologo nologo intro beta
ZIP1LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \
@@ -47,6 +47,10 @@ ZIP4LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png $(INTRO_BITMAPS)) \
$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) \
$(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png
+ZIP5LIST= \
+ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/intro.png $(INTRO_BITMAPS)) \
+ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/about.png $(ABOUT_BITMAPS)) \
+ $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png
ZIP1TARGET=dev_intro
ZIP1DEPS=$(ZIP1LIST)
@@ -60,6 +64,9 @@ ZIP3DEPS=$(ZIP3LIST)
ZIP4TARGET=intro_intro
ZIP4DEPS=$(ZIP4LIST)
+ZIP5TARGET=beta_intro
+ZIP5DEPS=$(ZIP5LIST)
+
.INCLUDE : target.mk
ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip)
@@ -85,6 +92,10 @@ $(COMMONBIN)$/intro$/intro.zip : $(COMMO
@@-$(MKDIR) $(@:d)
@$(COPY) $< $@
+$(COMMONBIN)$/beta$/intro.zip : $(COMMONBIN)$/beta_intro.zip
+ @@-$(MKDIR) $(@:d)
+ @$(COPY) $< $@
+
$(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
Modified: openoffice/branches/alg_writerframes/main/drawinglayer/inc/drawinglayer/attribute/sdrfillgraphicattribute.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/drawinglayer/inc/drawinglayer/attribute/sdrfillgraphicattribute.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/drawinglayer/inc/drawinglayer/attribute/sdrfillgraphicattribute.hxx (original)
+++ openoffice/branches/alg_writerframes/main/drawinglayer/inc/drawinglayer/attribute/sdrfillgraphicattribute.hxx Wed Mar 19 10:14:42 2014
@@ -56,6 +56,7 @@ namespace drawinglayer
/// constructors/assignmentoperator/destructor
SdrFillGraphicAttribute(
const Graphic& rFillGraphic,
+ const basegfx::B2DVector& rGraphicLogicSize,
const basegfx::B2DVector& rSize,
const basegfx::B2DVector& rOffset,
const basegfx::B2DVector& rOffsetPosition,
@@ -76,6 +77,7 @@ namespace drawinglayer
// data read access
const Graphic& getFillGraphic() const;
+ const basegfx::B2DVector& getGraphicLogicSize() const;
const basegfx::B2DVector& getSize() const;
const basegfx::B2DVector& getOffset() const;
const basegfx::B2DVector& getOffsetPosition() const;
Modified: openoffice/branches/alg_writerframes/main/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx (original)
+++ openoffice/branches/alg_writerframes/main/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx Wed Mar 19 10:14:42 2014
@@ -42,6 +42,7 @@ namespace drawinglayer
// data definitions
Graphic maFillGraphic;
+ basegfx::B2DVector maGraphicLogicSize;
basegfx::B2DVector maSize;
basegfx::B2DVector maOffset;
basegfx::B2DVector maOffsetPosition;
@@ -54,6 +55,7 @@ namespace drawinglayer
ImpSdrFillGraphicAttribute(
const Graphic& rFillGraphic,
+ const basegfx::B2DVector& rGraphicLogicSize,
const basegfx::B2DVector& rSize,
const basegfx::B2DVector& rOffset,
const basegfx::B2DVector& rOffsetPosition,
@@ -63,6 +65,7 @@ namespace drawinglayer
bool bLogSize)
: mnRefCount(0),
maFillGraphic(rFillGraphic),
+ maGraphicLogicSize(rGraphicLogicSize),
maSize(rSize),
maOffset(rOffset),
maOffsetPosition(rOffsetPosition),
@@ -75,6 +78,7 @@ namespace drawinglayer
// data read access
const Graphic& getFillGraphic() const { return maFillGraphic; }
+ const basegfx::B2DVector& getGraphicLogicSize() const { return maGraphicLogicSize; }
const basegfx::B2DVector& getSize() const { return maSize; }
const basegfx::B2DVector& getOffset() const { return maOffset; }
const basegfx::B2DVector& getOffsetPosition() const { return maOffsetPosition; }
@@ -86,6 +90,7 @@ namespace drawinglayer
bool operator==(const ImpSdrFillGraphicAttribute& rCandidate) const
{
return (getFillGraphic() == rCandidate.getFillGraphic()
+ && getGraphicLogicSize() == rCandidate.getGraphicLogicSize()
&& getSize() == rCandidate.getSize()
&& getOffset() == rCandidate.getOffset()
&& getOffsetPosition() == rCandidate.getOffsetPosition()
@@ -105,6 +110,7 @@ namespace drawinglayer
Graphic(),
basegfx::B2DVector(),
basegfx::B2DVector(),
+ basegfx::B2DVector(),
basegfx::B2DVector(),
basegfx::B2DVector(),
false,
@@ -121,6 +127,7 @@ namespace drawinglayer
SdrFillGraphicAttribute::SdrFillGraphicAttribute(
const Graphic& rFillGraphic,
+ const basegfx::B2DVector& rGraphicLogicSize,
const basegfx::B2DVector& rSize,
const basegfx::B2DVector& rOffset,
const basegfx::B2DVector& rOffsetPosition,
@@ -131,6 +138,7 @@ namespace drawinglayer
: mpSdrFillGraphicAttribute(
new ImpSdrFillGraphicAttribute(
rFillGraphic,
+ rGraphicLogicSize,
rSize,
rOffset,
rOffsetPosition,
@@ -210,6 +218,11 @@ namespace drawinglayer
return mpSdrFillGraphicAttribute->getFillGraphic();
}
+ const basegfx::B2DVector& SdrFillGraphicAttribute::getGraphicLogicSize() const
+ {
+ return mpSdrFillGraphicAttribute->getGraphicLogicSize();
+ }
+
const basegfx::B2DVector& SdrFillGraphicAttribute::getSize() const
{
return mpSdrFillGraphicAttribute->getSize();
@@ -249,7 +262,6 @@ namespace drawinglayer
{
// get logical size of bitmap (before expanding eventually)
Graphic aGraphic(getFillGraphic());
- const basegfx::B2DVector aLogicalSize(aGraphic.GetPrefSize().getWidth(), aGraphic.GetPrefSize().getHeight());
// init values with defaults for stretched
basegfx::B2DPoint aBitmapSize(1.0, 1.0);
@@ -277,7 +289,9 @@ namespace drawinglayer
}
else
{
- aBitmapSize.setX(aLogicalSize.getX());
+ // #124002# use GraphicLogicSize directly, do not try to use GetPrefSize
+ // of the graphic, that may not be adapted to the MapMode of the target
+ aBitmapSize.setX(getGraphicLogicSize().getX());
}
if(0.0 != getSize().getY())
@@ -293,7 +307,9 @@ namespace drawinglayer
}
else
{
- aBitmapSize.setY(aLogicalSize.getY());
+ // #124002# use GraphicLogicSize directly, do not try to use GetPrefSize
+ // of the graphic, that may not be adapted to the MapMode of the target
+ aBitmapSize.setY(getGraphicLogicSize().getY());
}
// position changes X
Modified: openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx (original)
+++ openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx Wed Mar 19 10:14:42 2014
@@ -79,112 +79,78 @@ namespace drawinglayer
if(getChildren().hasElements())
{
- // decompose to have current translate and scale
- basegfx::B2DVector aScale, aTranslate;
- double fRotate, fShearX;
-
- getTransformation().decompose(aScale, aTranslate, fRotate, fShearX);
-
- // detect 180 degree rotation, this is the same as mirrored in X and Y,
- // thus change to mirroring. Prefer mirroring here. Use the equal call
- // with getSmallValue here, the original which uses rtl::math::approxEqual
- // is too correct here. Maybe this changes with enhanced precision in aw080
- // to the better so that this can be reduced to the more precise call again
- if(basegfx::fTools::equal(fabs(fRotate), F_PI, 0.000000001))
- {
- aScale.setX(aScale.getX() * -1.0);
- aScale.setY(aScale.getY() * -1.0);
- fRotate = 0.0;
- }
-
- // create target translate and scale
- const bool bMirroredX(aScale.getX() < 0.0);
- const bool bMirroredY(aScale.getY() < 0.0);
- basegfx::B2DVector aTargetScale(aScale);
- basegfx::B2DVector aTargetTranslate(aTranslate);
-
- if(bMirroredX)
- {
- aTargetTranslate.setX(aTargetTranslate.getX() + getCropRight());
- aTargetScale.setX(aTargetScale.getX() - getCropLeft() - getCropRight());
- }
- else
- {
- aTargetTranslate.setX(aTargetTranslate.getX() - getCropLeft());
- aTargetScale.setX(aTargetScale.getX() + getCropRight() + getCropLeft());
- }
-
- if(bMirroredY)
- {
- aTargetTranslate.setY(aTargetTranslate.getY() + getCropBottom());
- aTargetScale.setY(aTargetScale.getY() - getCropTop() - getCropBottom());
- }
- else
- {
- aTargetTranslate.setY(aTargetTranslate.getY() - getCropTop());
- aTargetScale.setY(aTargetScale.getY() + getCropBottom() + getCropTop());
- }
-
- // create ranges to make comparisons
- const basegfx::B2DRange aCurrent(
- aTranslate.getX(), aTranslate.getY(),
- aTranslate.getX() + aScale.getX(), aTranslate.getY() + aScale.getY());
- const basegfx::B2DRange aCropped(
- aTargetTranslate.getX(), aTargetTranslate.getY(),
- aTargetTranslate.getX() + aTargetScale.getX(), aTargetTranslate.getY() + aTargetScale.getY());
-
- if(aCropped.isEmpty())
- {
- // nothing to return since cropped content is completely empty
- }
- else if(aCurrent.equal(aCropped))
- {
- // no crop, just use content
- xRetval = getChildren();
- }
- else
- {
- // build new combined content transformation
- basegfx::B2DHomMatrix aNewObjectTransform(getTransformation());
-
- // remove content transform by inverting
- aNewObjectTransform.invert();
+ // get original object scale in unit coordinates (no mirroring)
+ const basegfx::B2DVector aObjectScale(basegfx::absolute(getTransformation() * basegfx::B2DVector(1.0, 1.0)));
- // add target values and original shear/rotate
- aNewObjectTransform = basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
- aTargetScale.getX(),
- aTargetScale.getY(),
- fShearX,
- fRotate,
- aTargetTranslate.getX(),
- aTargetTranslate.getY())
- * aNewObjectTransform;
-
- // prepare TransformPrimitive2D with xPrimitive
- const Primitive2DReference xTransformPrimitive(
- new TransformPrimitive2D(
- aNewObjectTransform,
- getChildren()));
-
- if(aCurrent.isInside(aCropped))
- {
- // crop just shrunk so that its inside content,
- // no need to use a mask since not really cropped.
- xRetval = Primitive2DSequence(&xTransformPrimitive, 1);
- }
- else
+ // we handle cropping, so when no width or no height, content will be empty,
+ // so only do something when we have a width and a height
+ if(!aObjectScale.equalZero())
+ {
+ // calculate crop distances in unit coordinates. They are already combined with CropScaleFactor, thus
+ // are relative only to object scale
+ const double fBackScaleX(basegfx::fTools::equalZero(aObjectScale.getX()) ? 1.0 : 1.0 / fabs(aObjectScale.getX()));
+ const double fBackScaleY(basegfx::fTools::equalZero(aObjectScale.getY()) ? 1.0 : 1.0 / fabs(aObjectScale.getY()));
+ const double fLeft(getCropLeft() * fBackScaleX);
+ const double fTop(getCropTop() * fBackScaleY);
+ const double fRight(getCropRight() * fBackScaleX);
+ const double fBottom(getCropBottom() * fBackScaleY);
+
+ // calc new unit range for comparisons; the original range is the unit range
+ const basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0);
+ const basegfx::B2DRange aNewRange(
+ -fLeft,
+ -fTop,
+ 1.0 + fRight,
+ 1.0 + fBottom);
+
+ // if we have no overlap the crop has removed everything, so we do only
+ // have to create content if this is not the case
+ if(aNewRange.overlaps(aUnitRange))
{
- // mask with original object's bounds
- basegfx::B2DPolyPolygon aMaskPolyPolygon(basegfx::tools::createUnitPolygon());
- aMaskPolyPolygon.transform(getTransformation());
-
- // create maskPrimitive with aMaskPolyPolygon and aMaskContentVector
- const Primitive2DReference xMask(
- new MaskPrimitive2D(
- aMaskPolyPolygon,
- Primitive2DSequence(&xTransformPrimitive, 1)));
+ // create new transform; first take out old transform to get
+ // to unit coordinates by inverting. Inverting should be flawless
+ // since we already cheched that object size is not zero in X or Y
+ basegfx::B2DHomMatrix aNewTransform(getTransformation());
+
+ aNewTransform.invert();
+
+ // apply crop enlargement in unit coordinates
+ aNewTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(
+ aNewRange.getRange(),
+ aNewRange.getMinimum()) * aNewTransform;
+
+ // apply original transformation. Since we have manipulated the crop
+ // in unit coordinates we do not need to care about mirroring or
+ // a corrected point for eventual shear or rotation, this all comes for
+ // free
+ aNewTransform = getTransformation() * aNewTransform;
+
+ // prepare TransformPrimitive2D with xPrimitive
+ const Primitive2DReference xTransformPrimitive(
+ new TransformPrimitive2D(
+ aNewTransform,
+ getChildren()));
+
+ if(aUnitRange.isInside(aNewRange))
+ {
+ // the new range is completely inside the old range (unit range),
+ // so no masking is needed
+ xRetval = Primitive2DSequence(&xTransformPrimitive, 1);
+ }
+ else
+ {
+ // mask with original object's bounds
+ basegfx::B2DPolyPolygon aMaskPolyPolygon(basegfx::tools::createUnitPolygon());
+ aMaskPolyPolygon.transform(getTransformation());
+
+ // create maskPrimitive with aMaskPolyPolygon and aMaskContentVector
+ const Primitive2DReference xMask(
+ new MaskPrimitive2D(
+ aMaskPolyPolygon,
+ Primitive2DSequence(&xTransformPrimitive, 1)));
- xRetval = Primitive2DSequence(&xMask, 1);
+ xRetval = Primitive2DSequence(&xMask, 1);
+ }
}
}
}
Modified: openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx (original)
+++ openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx Wed Mar 19 10:14:42 2014
@@ -759,9 +759,23 @@ namespace drawinglayer
basegfx::B2DPolygon aMaskPolygon(basegfx::tools::createUnitPolygon());
aMaskPolygon.transform(rTransform);
- aRetval[0] = new MaskPrimitive2D(
+ // #124073# the clde below was compiler-dependent. Normally,
+ // a compiler will
+ // - alloc mem
+ // - ececute the constructor
+ // - do the assignment
+ // but the mac compiler does alloc-assign-constructor, thus
+ // modifying aRetval[0] befure aRetval gets used in the
+ // constructor. This creates an endless loop in the primitive
+ // stack. Thus do it the safe way.
+ //
+ // aRetval[0] = new MaskPrimitive2D(
+ // basegfx::B2DPolyPolygon(aMaskPolygon),
+ // aRetval);
+ MaskPrimitive2D* pMaskPrimitive2D = new MaskPrimitive2D(
basegfx::B2DPolyPolygon(aMaskPolygon),
aRetval);
+ aRetval[0] = pMaskPrimitive2D;
}
#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
}
Modified: openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/textlayoutdevice.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/textlayoutdevice.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/textlayoutdevice.cxx (original)
+++ openoffice/branches/alg_writerframes/main/drawinglayer/source/primitive2d/textlayoutdevice.cxx Wed Mar 19 10:14:42 2014
@@ -342,12 +342,12 @@ namespace drawinglayer
if(nTextLength)
{
aRetval.reserve(nTextLength);
- sal_Int32* pArray = new sal_Int32[nTextLength];
- mrDevice.GetTextArray(rText, pArray, nIndex, nLength);
+ ::std::vector<sal_Int32> aDXArray( nTextLength);
+ mrDevice.GetTextArray(rText, &aDXArray[0], nIndex, nLength);
for(sal_uInt32 a(0); a < nTextLength; a++)
{
- aRetval.push_back(pArray[a]);
+ aRetval.push_back(aDXArray[a]);
}
}
Modified: openoffice/branches/alg_writerframes/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx (original)
+++ openoffice/branches/alg_writerframes/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx Wed Mar 19 10:14:42 2014
@@ -796,7 +796,19 @@ namespace drawinglayer
sal_Int32(floor(aCurrentRange.getMinX())), sal_Int32(floor(aCurrentRange.getMinY())),
sal_Int32(ceil(aCurrentRange.getMaxX())), sal_Int32(ceil(aCurrentRange.getMaxY())));
const GraphicAttr& rAttr = rGraphicPrimitive.getGraphicAttr();
- Rectangle aCropRect;
+
+ // #123295# As described below this is the expanded, uncropped region
+ // and needs to be given in any case, especially when no cropping it is
+ // equal to the current rect. To make clear: normally the uncropped region
+ // (aka the aCropRect) is bigger than the CurrentRect. Or in other words:
+ // The current rect is the object area. This internal crop definition is
+ // somewhat crude, but used (and defined in graphic-dependent units what
+ // leads to even more problems, percentages would have been better). All
+ // in all this is a place that makes clear that a pure PDF export which does
+ // not use Metafile and the associated hacks (like this one) but is based on
+ // Primitves and uses a Primitive Renderer would be the better choice for
+ // the future.
+ Rectangle aCropRect(aCurrentRect);
if(rAttr.IsCropped())
{
Modified: openoffice/branches/alg_writerframes/main/dtrans/source/win32/dtobj/DOTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/dtrans/source/win32/dtobj/DOTransferable.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/dtrans/source/win32/dtobj/DOTransferable.cxx (original)
+++ openoffice/branches/alg_writerframes/main/dtrans/source/win32/dtobj/DOTransferable.cxx Wed Mar 19 10:14:42 2014
@@ -136,12 +136,14 @@ Any SAL_CALL CDOTransferable::getTransfe
Any aAny = makeAny( aUnicodeText );
return aAny;
}
+ // #124085# CF_DIBV5 should not be possible, but keep for reading from the
+ // clipboard for being on the safe side
else if(CF_DIBV5 == fetc.getClipformat())
{
// #123407# CF_DIBV5 has priority; if the try to fetch this failed,
// check CF_DIB availability as an alternative
fetc.setClipformat(CF_DIB);
-
+
try
{
clipDataStream = getClipboardData( fetc );
@@ -373,6 +375,7 @@ CDOTransferable::ByteSequence_t SAL_CALL
clipDataToByteStream( aFormatEtc.getClipformat( ), stgmedium, byteStream );
// format conversion if necessary
+ // #124085# DIBV5 should not happen currently, but keep as a hint here
if(CF_DIBV5 == aFormatEtc.getClipformat() || CF_DIB == aFormatEtc.getClipformat())
{
byteStream = WinDIBToOOBMP(byteStream);
Modified: openoffice/branches/alg_writerframes/main/dtrans/source/win32/dtobj/XTDataObject.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/dtrans/source/win32/dtobj/XTDataObject.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/dtrans/source/win32/dtobj/XTDataObject.cxx (original)
+++ openoffice/branches/alg_writerframes/main/dtrans/source/win32/dtobj/XTDataObject.cxx Wed Mar 19 10:14:42 2014
@@ -307,6 +307,7 @@ void SAL_CALL CXTDataObject::renderAnyDa
nRequiredMemSize = sizeof( sal_Int8 ) * clipDataStream.getLength( ) + 1;
// prepare data for transmision
+ // #124085# DIBV5 should not happen for now, but keep as hint here
if ( CF_DIBV5 == fetc.cfFormat || CF_DIB == fetc.cfFormat )
{
#ifdef DBG_UTIL
Modified: openoffice/branches/alg_writerframes/main/dtrans/source/win32/ftransl/ftransl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/dtrans/source/win32/ftransl/ftransl.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/dtrans/source/win32/ftransl/ftransl.cxx (original)
+++ openoffice/branches/alg_writerframes/main/dtrans/source/win32/ftransl/ftransl.cxx Wed Mar 19 10:14:42 2014
@@ -276,7 +276,13 @@ void SAL_CALL CDataFormatTranslator::ini
//SOT_FORMATSTR_ID_DIF
m_TranslTable.push_back(FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT));
// SOT_FORMAT_BITMAP
- m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_DIBV5, CPPUTYPE_DEFAULT));
+
+ // #124085# CF_DIBV5 disabled, leads to problems at export. To fully support, using
+ // an own mime-type may be necessary. I have tried that, but saw no real advantages
+ // with different apps when exchanging bitmap-based data. So, disabled for now. At
+ // the same time increased png format exchange for better interoperability
+ //m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_DIBV5, CPPUTYPE_DEFAULT));
+
m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_DIB, CPPUTYPE_DEFAULT));
m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_BITMAP, CPPUTYPE_DEFAULT));
// SOT_FORMAT_STRING
Modified: openoffice/branches/alg_writerframes/main/editeng/inc/editeng/outlobj.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/editeng/inc/editeng/outlobj.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/editeng/inc/editeng/outlobj.hxx (original)
+++ openoffice/branches/alg_writerframes/main/editeng/inc/editeng/outlobj.hxx Wed Mar 19 10:14:42 2014
@@ -46,11 +46,9 @@ private:
public:
// constructors/destructor
- OutlinerParaObject(
- const EditTextObject& rEditTextObject,
- const ParagraphDataVector& rParagraphDataVector = ParagraphDataVector(),
- bool bIsEditDoc = true);
- OutlinerParaObject(const OutlinerParaObject& rCandidate);
+ OutlinerParaObject( const EditTextObject&, const ParagraphDataVector&, bool bIsEditDoc = true);
+ OutlinerParaObject( const EditTextObject&);
+ OutlinerParaObject( const OutlinerParaObject&);
~OutlinerParaObject();
// assignment operator
Modified: openoffice/branches/alg_writerframes/main/editeng/source/items/frmitems.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/editeng/source/items/frmitems.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/editeng/source/items/frmitems.cxx (original)
+++ openoffice/branches/alg_writerframes/main/editeng/source/items/frmitems.cxx Wed Mar 19 10:14:42 2014
@@ -336,10 +336,12 @@ SfxItemPresentation SvxSizeItem::GetPres
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH);
rText += GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
rText += cpDelim;
rText += EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT);
rText += GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
return SFX_ITEM_PRESENTATION_COMPLETE;
//no break necessary
@@ -609,6 +611,7 @@ SfxItemPresentation SvxLRSpaceItem::GetP
{
rText += GetMetricText( (long)nLeftMargin,
eCoreUnit, ePresUnit, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
}
rText += cpDelim;
@@ -622,6 +625,7 @@ SfxItemPresentation SvxLRSpaceItem::GetP
{
rText += GetMetricText( (long)nFirstLineOfst,
eCoreUnit, ePresUnit, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
}
rText += cpDelim;
@@ -633,6 +637,7 @@ SfxItemPresentation SvxLRSpaceItem::GetP
{
rText += GetMetricText( (long)nRightMargin,
eCoreUnit, ePresUnit, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
@@ -958,6 +963,7 @@ SfxItemPresentation SvxULSpaceItem::GetP
else
{
rText += GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
}
rText += cpDelim;
@@ -967,6 +973,7 @@ SfxItemPresentation SvxULSpaceItem::GetP
else
{
rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
@@ -1477,6 +1484,7 @@ SfxItemPresentation SvxShadowItem::GetPr
rText += EE_RESSTR(nId);
rText += cpDelim;
rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
rText += cpDelim;
rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
@@ -1682,6 +1690,7 @@ XubString SvxBorderLine::GetValueString(
else
{
String sMetric = EE_RESSTR(GetMetricId( eDestUnit ));
+ sMetric.Insert( sal_Unicode(' '), 0 );
aStr += GetMetricText( (long)nInWidth, eSrcUnit, eDestUnit, pIntl );
if ( bMetricStr )
aStr += sMetric;
@@ -2219,28 +2228,33 @@ SfxItemPresentation SvxBoxItem::GetPrese
{
rText += GetMetricText( (long)nTopDist, eCoreUnit,
ePresUnit, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
}
else
{
- (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP))
+ ((((rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP))
+= GetMetricText( (long)nTopDist, eCoreUnit,
ePresUnit, pIntl ))
+ += sal_Unicode(' '))
+= EE_RESSTR(GetMetricId(ePresUnit)))
+= cpDelim;
- (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM))
+ ((((rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM))
+= GetMetricText( (long)nBottomDist, eCoreUnit,
ePresUnit, pIntl ))
+ += sal_Unicode(' '))
+= EE_RESSTR(GetMetricId(ePresUnit)))
+= cpDelim;
- (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT))
+ ((((rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT))
+= GetMetricText( (long)nLeftDist, eCoreUnit,
ePresUnit, pIntl ))
+ += sal_Unicode(' '))
+= EE_RESSTR(GetMetricId(ePresUnit)))
+= cpDelim;
- ((rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT))
+ (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT))
+= GetMetricText( (long)nRightDist, eCoreUnit,
ePresUnit, pIntl ))
+ += sal_Unicode(' '))
+= EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
Modified: openoffice/branches/alg_writerframes/main/editeng/source/items/paraitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/editeng/source/items/paraitem.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/editeng/source/items/paraitem.cxx (original)
+++ openoffice/branches/alg_writerframes/main/editeng/source/items/paraitem.cxx Wed Mar 19 10:14:42 2014
@@ -1196,7 +1196,10 @@ SfxItemPresentation SvxTabStopItem::GetP
rText += GetMetricText(
(long)((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl );
if ( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
+ {
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(ePresUnit));
+ }
bComma = sal_True;
}
}
Modified: openoffice/branches/alg_writerframes/main/editeng/source/items/textitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/editeng/source/items/textitem.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/editeng/source/items/textitem.cxx (original)
+++ openoffice/branches/alg_writerframes/main/editeng/source/items/textitem.cxx Wed Mar 19 10:14:42 2014
@@ -1105,8 +1105,9 @@ SfxItemPresentation SvxFontHeightItem::G
{
if( SFX_MAPUNIT_RELATIVE != ePropUnit )
{
- ( rText = String::CreateFromInt32( (short)nProp ) ) +=
- EE_RESSTR( GetMetricId( ePropUnit ) );
+ rText = String::CreateFromInt32( (short)nProp );
+ rText += sal_Unicode(' ');
+ rText += EE_RESSTR( GetMetricId( ePropUnit ) );
if( 0 <= (short)nProp )
rText.Insert( sal_Unicode('+'), 0 );
}
@@ -1114,6 +1115,7 @@ SfxItemPresentation SvxFontHeightItem::G
{
rText = GetMetricText( (long)nHeight,
eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
}
else
@@ -1319,6 +1321,7 @@ SfxItemPresentation SvxFontWidthItem::Ge
{
rText = GetMetricText( (long)nWidth,
eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
}
else
@@ -2257,6 +2260,7 @@ SfxItemPresentation SvxKerningItem::GetP
return ePres;
case SFX_ITEM_PRESENTATION_NAMELESS:
rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
return ePres;
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -2272,6 +2276,7 @@ SfxItemPresentation SvxKerningItem::GetP
if ( nId )
rText += EE_RESSTR(nId);
rText += GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
+ rText += sal_Unicode(' ');
rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
return ePres;
}
Modified: openoffice/branches/alg_writerframes/main/editeng/source/outliner/outlobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/editeng/source/outliner/outlobj.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/editeng/source/outliner/outlobj.cxx (original)
+++ openoffice/branches/alg_writerframes/main/editeng/source/outliner/outlobj.cxx Wed Mar 19 10:14:42 2014
@@ -98,6 +98,10 @@ OutlinerParaObject::OutlinerParaObject(c
{
}
+OutlinerParaObject::OutlinerParaObject( const EditTextObject& rEditTextObject)
+: mpImplOutlinerParaObject( new ImplOutlinerParaObject( rEditTextObject.Clone(), ParagraphDataVector(), true))
+{}
+
OutlinerParaObject::OutlinerParaObject(const OutlinerParaObject& rCandidate)
: mpImplOutlinerParaObject(rCandidate.mpImplOutlinerParaObject)
{
Modified: openoffice/branches/alg_writerframes/main/extensions.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/extensions.lst?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/extensions.lst (original)
+++ openoffice/branches/alg_writerframes/main/extensions.lst Wed Mar 19 10:14:42 2014
@@ -39,7 +39,7 @@
# English dictionary
[ language=en.* || language=de || language=it ]
- 3c3f841f5d40403bcc4d6bb685a38160 http://sourceforge.net/projects/aoo-extensions/files/17102/1/dict-en.oxt/download "dict-en.oxt"
+ 21000528c50707539220e05df554172f http://sourceforge.net/projects/aoo-extensions/files/17102/3/dict-en.oxt/download "dict-en.oxt"
# English (USA, en_US) dictionary
[ language==nl || language==ru ]
@@ -70,6 +70,10 @@
b38cba04b6513dd42b031199d617cce6 http://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt"
6ee1e24fb17e44577d8e3200f3e44adc http://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da-current.oxt"
+# Lithuanian dictionary.
+[ language=lt ]
+ d8d4a3d5c6abfde1b4c81cc1ddd1afa0 http://sourceforge.net/projects/aoo-extensions/files/17703/0/openoffice-spellcheck-lt-1.3.oxt/download "openoffice-spellcheck-lt-1.3.oxt"
+
# Romanian dictionary.
[ language=ro ]
b05941b975afc0321df0cd48a4d295c8 http://sourceforge.net/projects/aoo-extensions/files/1392/8/dict-ro.1.5.oxt/download "dict-ro.1.5.oxt"
Modified: openoffice/branches/alg_writerframes/main/extras/source/autotext/lang/en-US/acor_en-US.dat
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/extras/source/autotext/lang/en-US/acor_en-US.dat?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/eras/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/eras/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/eras/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/eras/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/eras.obj
SHL1TARGET= era$(DLLPOSTFIX)
SHL1IMPLIB= eras
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/eras.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/etiff/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/etiff/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/etiff/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/etiff/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/etiff.obj
SHL1TARGET= eti$(DLLPOSTFIX)
SHL1IMPLIB= etiff
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/etiff.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/expm/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/expm/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/expm/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/expm/makefile.mk Wed Mar 19 10:14:42 2014
@@ -45,6 +45,9 @@ SLOFILES = $(SLO)$/expm.obj
SHL1TARGET= exp$(DLLPOSTFIX)
SHL1IMPLIB= expm
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/expm.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/idxf/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/idxf/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/idxf/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/idxf/makefile.mk Wed Mar 19 10:14:42 2014
@@ -55,6 +55,9 @@ SLOFILES = $(SLO)$/dxfgrprd.obj \
SHL1TARGET= idx$(DLLPOSTFIX)
SHL1IMPLIB= idxf
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/idxf.lib # $(LB)$/rtftoken.lib
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ieps/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ieps/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ieps/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ieps/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/ieps.obj
SHL1TARGET= ips$(DLLPOSTFIX)
SHL1IMPLIB= ieps
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/ieps.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ios2met/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ios2met/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ios2met/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ios2met/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/ios2met.obj
SHL1TARGET= ime$(DLLPOSTFIX)
SHL1IMPLIB= ios2met
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/ios2met.lib # $(LB)$/rtftoken.lib
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipbm/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipbm/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipbm/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipbm/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/ipbm.obj
SHL1TARGET= ipb$(DLLPOSTFIX)
SHL1IMPLIB= ipbm
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/ipbm.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipcd/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipcd/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipcd/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipcd/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/ipcd.obj
SHL1TARGET= icd$(DLLPOSTFIX)
SHL1IMPLIB= ipcd
SHL1STDLIBS= $(SVTOOLLIB) $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/ipcd.lib # $(LB)$/rtftoken.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipcx/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipcx/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipcx/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipcx/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/ipcx.obj
SHL1TARGET= ipx$(DLLPOSTFIX)
SHL1IMPLIB= ipcx
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/ipcx.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipict/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipict/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipict/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipict/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/ipict.obj $(SLO)$/sh
SHL1TARGET= ipt$(DLLPOSTFIX)
SHL1IMPLIB= ipict
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(BASEGFXLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/ipict.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipsd/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipsd/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipsd/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/ipsd/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/ipsd.obj
SHL1TARGET= ipd$(DLLPOSTFIX)
SHL1IMPLIB= ipsd
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/ipsd.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/iras/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/iras/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/iras/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/iras/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/iras.obj
SHL1TARGET= ira$(DLLPOSTFIX)
SHL1IMPLIB= iras
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/iras.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/itga/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/itga/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/itga/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/itga/makefile.mk Wed Mar 19 10:14:42 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/itga.obj
SHL1TARGET= itg$(DLLPOSTFIX)
SHL1IMPLIB= itga
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/itga.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/itiff/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/itiff/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/itiff/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/graphicfilter/itiff/makefile.mk Wed Mar 19 10:14:42 2014
@@ -48,6 +48,9 @@ EXCEPTIONSNOOPTFILES= $(SLO)$/itiff.obj
SHL1TARGET= iti$(DLLPOSTFIX)
SHL1IMPLIB= itiff
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/itiff.lib # $(LB)$/rtftoken.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/branches/alg_writerframes/main/filter/source/msfilter/escherex.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/msfilter/escherex.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/msfilter/escherex.cxx (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/msfilter/escherex.cxx Wed Mar 19 10:14:42 2014
@@ -4373,6 +4373,15 @@ sal_uInt32 EscherGraphicProvider::GetBli
{
case GFX_LINK_TYPE_NATIVE_JPG : p_EscherBlibEntry->meBlibType = PEG; break;
case GFX_LINK_TYPE_NATIVE_PNG : p_EscherBlibEntry->meBlibType = PNG; break;
+
+ // #15508# added BMP type for better exports; need to check this
+ // checked - does not work that way, so keep out for now. It may
+ // work somehow with direct DIB data, but that would need to be checked
+ // carefully
+ // for more comments please check RtfAttributeOutput::FlyFrameGraphic
+ //
+ // case GFX_LINK_TYPE_NATIVE_BMP : p_EscherBlibEntry->meBlibType = DIB; break;
+
case GFX_LINK_TYPE_NATIVE_WMF :
{
if ( pGraphicAry && ( p_EscherBlibEntry->mnSize > 0x2c ) )
@@ -4472,11 +4481,30 @@ sal_uInt32 EscherGraphicProvider::GetBli
else if ( eBlibType == PEG )
rPicOutStrm << (sal_uInt16)0x0505;
}
- if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) )
+ if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) ) // || ( eBlibType == DIB )) // #15508#
{
nExtra = 17;
p_EscherBlibEntry->mnSizeExtra = nExtra + 8;
- nInstance = ( eBlibType == PNG ) ? 0xf01e6e00 : 0xf01d46a0;
+
+ // #15508# type see SvxMSDffManager::GetBLIPDirect (checked, does not work this way)
+ // see RtfAttributeOutput::FlyFrameGraphic for more comments
+ // maybe it would work with direct DIB data, but that would need thorough testing
+ if( eBlibType == PNG )
+ {
+ nInstance = 0xf01e6e00;
+ }
+ else // if( eBlibType == PEG )
+ {
+ nInstance = 0xf01d46a0;
+ }
+ //else // eBlibType == DIB
+ //{
+ // nInstance = 0xf01d7A80;
+ //}
+
+ // #15508#
+ //nInstance = ( eBlibType == PNG ) ? 0xf01e6e00 : 0xf01d46a0;
+
rPicOutStrm << nInstance << (sal_uInt32)( p_EscherBlibEntry->mnSize + nExtra );
rPicOutStrm.Write( p_EscherBlibEntry->mnIdentifier, 16 );
rPicOutStrm << (sal_uInt8)0xff;
Modified: openoffice/branches/alg_writerframes/main/filter/source/msfilter/svdfppt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/msfilter/svdfppt.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/msfilter/svdfppt.cxx (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/msfilter/svdfppt.cxx Wed Mar 19 10:14:42 2014
@@ -1089,7 +1089,7 @@ SdrObject* SdrEscherImport::ProcessObj(
}
sal_uInt32 nDestinationInstance = aTextObj.GetInstance();
- if ( ( rPersistEntry.ePageKind == PPT_MASTERPAGE ) )
+ if ( rPersistEntry.ePageKind == PPT_MASTERPAGE )
{
if ( !rPersistEntry.pPresentationObjects )
{