diff options
| author | Joren De Cuyper <jorendc@libreoffice.org> | 2014-06-25 21:26:00 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-26 15:46:36 +0000 |
| commit | 0ac652bbc01ab7c9304b5e230695f4193dfadd09 (patch) | |
| tree | 67ff303f3cdae5678c3ab845369bfdd4abacf81e /sc/source/ui | |
| parent | 224d51af5aa9faa33a57f1325431cd12a7952a62 (diff) | |
fdo#39111 - UI inconsistent concerning suppression of output for empty pages
Change-Id: I6017e77e46298b45c7584830178455fe29016209
Reviewed-on: https://gerrit.libreoffice.org/9907
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/src/scstring.src | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index b083fffed02d..cc07d2c79a5a 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -784,7 +784,7 @@ StringArray SCSTR_PRINT_OPTIONS ItemList [en-US] = { < "Pages"; >; - < "~Include output of empty pages"; >; + < "~Suppress output of empty pages"; >; < "Print content"; >; < "~All sheets"; >; < "~Selected sheets"; >; diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 57a80b552c34..2662e4c70f95 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -242,10 +242,10 @@ ScPrintUIOptions::ScPrintUIOptions() m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pages", OUString(aStrings.GetString(0)), OUString()); // create a bool option for empty pages - m_aUIProperties[nIdx++].Value = setBoolControlOpt("includeemptypages", OUString( aStrings.GetString( 1 ) ), - ".HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox", - "IsIncludeEmptyPages", - ! bSuppress); + m_aUIProperties[nIdx++].Value = setBoolControlOpt("suppressemptypages", OUString( aStrings.GetString( 1 ) ), + ".HelpID:vcl:PrintDialog:IsSuppressEmptyPages:CheckBox", + "IsSuppressEmptyPages", + bSuppress); // show Subgroup for print content vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; aPrintRangeOpt.maGroupHint = "PrintRange"; @@ -326,9 +326,9 @@ void ScPrintUIOptions::SetDefaults() aPropertyValue.Value <<= nContent; aUIProp[nPropPos].Value <<= aPropertyValue; } - else if ( aPropertyValue.Name == "IsIncludeEmptyPages" ) + else if ( aPropertyValue.Name == "IsSuppressEmptyPages" ) { - ScUnoHelpFunctions::SetBoolInAny( aPropertyValue.Value, ! bSuppress ); + ScUnoHelpFunctions::SetBoolInAny( aPropertyValue.Value, bSuppress ); aUIProp[nPropPos].Value <<= aPropertyValue; } } @@ -789,7 +789,7 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, // defaults when no options are passed: all sheets, include empty pages bool bSelectedSheetsOnly = false; - bool bIncludeEmptyPages = true; + bool bSuppressEmptyPages = true; bool bHasPrintContent = false; sal_Int32 nPrintContent = 0; // all sheets / selected sheets / selected cells @@ -802,9 +802,9 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, { rOptions[i].Value >>= bSelectedSheetsOnly; } - else if ( rOptions[i].Name == "IsIncludeEmptyPages" ) + else if ( rOptions[i].Name == "IsSuppressEmptyPages" ) { - rOptions[i].Value >>= bIncludeEmptyPages; + rOptions[i].Value >>= bSuppressEmptyPages; } else if ( rOptions[i].Name == "PageRange" ) { @@ -933,7 +933,7 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, } ScPrintOptions aNewOptions; - aNewOptions.SetSkipEmpty( !bIncludeEmptyPages ); + aNewOptions.SetSkipEmpty( bSuppressEmptyPages ); aNewOptions.SetAllSheets( !bSelectedSheetsOnly ); rStatus.SetOptions( aNewOptions ); |