Skip to content

C
core
Kaydet (Commit) f138cf2c authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

condition is always true because of wrongly placed ) 

Change-Id: Id5f2c623375419daa4433fc2f925921e6013846f
üst 2c5acc39
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
sd/source/filter/eppt/epptso.cxx
Dosyayı görüntüle @ f138cf2c
...@@ -990,7 +990,7 @@ bool PPTWriter::ImplGetText() ...@@ -990,7 +990,7 @@ bool PPTWriter::ImplGetText()
{ {
mnTextSize = mXText->getString().getLength(); mnTextSize = mXText->getString().getLength();
::com::sun::star::uno::Any aAny; ::com::sun::star::uno::Any aAny;
if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ) ), sal_True ) if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ), sal_True ) )
aAny >>= mbFontIndependentLineSpacing; aAny >>= mbFontIndependentLineSpacing;
} }
return ( mnTextSize != 0 ); return ( mnTextSize != 0 );
...@@ -3674,7 +3674,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc ...@@ -3674,7 +3674,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
mnTextSize = mXText->getString().getLength(); mnTextSize = mXText->getString().getLength();
::com::sun::star::uno::Any aAny; ::com::sun::star::uno::Any aAny;
if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ) ), sal_True ) if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ), sal_True ) )
aAny >>= mbFontIndependentLineSpacing; aAny >>= mbFontIndependentLineSpacing;
EscherPropertyContainer aPropOptSp; EscherPropertyContainer aPropOptSp;
......
sd/source/filter/eppt/pptx-epptbase.cxx
Dosyayı görüntüle @ f138cf2c
...@@ -439,7 +439,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference ...@@ -439,7 +439,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference
{ {
::com::sun::star::uno::Any aAny; ::com::sun::star::uno::Any aAny;
sal_Int32 nLayout = 20; sal_Int32 nLayout = 20;
if ( GetPropertyValue( aAny, rXPropSet, OUString( "Layout" ) ), sal_True ) if ( GetPropertyValue( aAny, rXPropSet, OUString( "Layout" ), sal_True ) )
aAny >>= nLayout; aAny >>= nLayout;
DBG(printf("GetLayoutOffset %" SAL_PRIdINT32 "\n", nLayout)); DBG(printf("GetLayoutOffset %" SAL_PRIdINT32 "\n", nLayout));
......
sd/source/filter/eppt/pptx-text.cxx
Dosyayı görüntüle @ f138cf2c
...@@ -515,13 +515,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com ...@@ -515,13 +515,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
OUString aFieldKind( aXTextField->getPresentation( sal_True ) ); OUString aFieldKind( aXTextField->getPresentation( sal_True ) );
if ( aFieldKind == "Date" ) if ( aFieldKind == "Date" )
{ {
if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) )
{ {
bool bBool = false; bool bBool = false;
aAny >>= bBool; aAny >>= bBool;
if ( !bBool ) // Fixed DateFields does not exist in PPT if ( !bBool ) // Fixed DateFields does not exist in PPT
{ {
if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ) ), sal_True ) if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ), sal_True ) )
{ {
nFormat = *(sal_Int32*)aAny.getValue(); nFormat = *(sal_Int32*)aAny.getValue();
switch ( nFormat ) switch ( nFormat )
...@@ -543,7 +543,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com ...@@ -543,7 +543,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
} }
else if ( aFieldKind == "URL" ) else if ( aFieldKind == "URL" )
{ {
if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "URL" ) ), sal_True ) if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "URL" ), sal_True ) )
rURL = *(OUString*)aAny.getValue(); rURL = *(OUString*)aAny.getValue();
nRetValue = 4 << 28; nRetValue = 4 << 28;
} }
...@@ -557,13 +557,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com ...@@ -557,13 +557,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
} }
else if ( aFieldKind == "Time" ) else if ( aFieldKind == "Time" )
{ {
if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) )
{ {
bool bBool = false; bool bBool = false;
aAny >>= bBool; aAny >>= bBool;
if ( !bBool ) if ( !bBool )
{ {
if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) )
{ {
nFormat = *(sal_Int32*)aAny.getValue(); nFormat = *(sal_Int32*)aAny.getValue();
nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000; nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000;
...@@ -581,13 +581,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com ...@@ -581,13 +581,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
} }
else if ( aFieldKind == "ExtTime" ) else if ( aFieldKind == "ExtTime" )
{ {
if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) )
{ {
bool bBool = false; bool bBool = false;
aAny >>= bBool; aAny >>= bBool;
if ( !bBool ) if ( !bBool )
{ {
if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ) ), sal_True ) if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ), sal_True ) )
{ {
nFormat = *(sal_Int32*)aAny.getValue(); nFormat = *(sal_Int32*)aAny.getValue();
switch ( nFormat ) switch ( nFormat )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment