summaryrefslogtreecommitdiff
path: root/cui/source/options/optinet2.cxx
diff options
context:
space:
mode:
authorCharu Tyagi <charu.tyagi@ericsson.com>2015-03-25 10:13:35 +0530
committerStephan Bergmann <sbergman@redhat.com>2015-03-31 12:33:01 +0200
commit50a0ddb99d53f86b571acc0373f0d2b4ec6d611a (patch)
tree93b3f897bfd152d0e20de39baee897830b76fe70 /cui/source/options/optinet2.cxx
parent08983ca2872d83685547cb5c05467ad21a27d834 (diff)
fdo#87441-Send document as Email removes invisible content
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, plus trivial modifications for -Werror,-Wlogical-op-parentheses and loplugin:bodynotinblock Change-Id: I149681b3743eaf96e98419bd568f88b451e9ba01
Diffstat (limited to 'cui/source/options/optinet2.cxx')
-rw-r--r--cui/source/options/optinet2.cxx27
1 files changed, 25 insertions, 2 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index c384de188dec..b7903817c635 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -938,6 +938,7 @@ class MailerProgramCfg_Impl : public utl::ConfigItem
OUString sProgram;
// readonly states
bool bROProgram;
+ bool bHidden;
const Sequence<OUString> GetPropertyNames();
@@ -973,6 +974,12 @@ MailerProgramCfg_Impl::MailerProgramCfg_Impl() :
bROProgram = pROStates[nProp];
}
break;
+ case 1 :
+ {
+ pValues[nProp] >>= bHidden;;
+
+ }
+ break;
}
}
}
@@ -988,9 +995,10 @@ MailerProgramCfg_Impl::~MailerProgramCfg_Impl()
const Sequence<OUString> MailerProgramCfg_Impl::GetPropertyNames()
{
- Sequence<OUString> aRet(1);
+ Sequence<OUString> aRet(2);
OUString* pRet = aRet.getArray();
pRet[0] = "Program";
+ pRet[1] = "Hidden";
return aRet;
}
@@ -1019,6 +1027,13 @@ void MailerProgramCfg_Impl::ImplCommit()
}
}
break;
+ case 1:
+ {
+ aNames[nRealCount] = aOrgNames[nProp];
+ aValues[nRealCount] <<= bHidden;;
+ ++nRealCount;
+ }
+ break;
}
}
@@ -1046,6 +1061,7 @@ SvxEMailTabPage::SvxEMailTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
get(m_pMailerURLFI, "lockemail");
get(m_pMailerURLED, "url");
get(m_pMailerURLPB, "browse");
+ get(m_pSuppressHidden, "suppressHidden");
m_sDefaultFilterName = get<FixedText>("browsetitle")->GetText();
m_pMailerURLPB->SetClickHdl( LINK( this, SvxEMailTabPage, FileDialogHdl_Impl ) );
}
@@ -1069,9 +1085,10 @@ SfxTabPage* SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rA
bool SvxEMailTabPage::FillItemSet( SfxItemSet* )
{
bool bMailModified = false;
- if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->IsValueChangedFromSaved())
+ if((!pImpl->aMailConfig.bROProgram && m_pMailerURLED->IsValueChangedFromSaved()) || m_pSuppressHidden->IsValueChangedFromSaved())
{
pImpl->aMailConfig.sProgram = m_pMailerURLED->GetText();
+ pImpl->aMailConfig.bHidden = m_pSuppressHidden->GetState();
bMailModified = true;
}
if ( bMailModified )
@@ -1093,6 +1110,12 @@ void SvxEMailTabPage::Reset( const SfxItemSet* )
m_pMailerURLED->SetText(pImpl->aMailConfig.sProgram);
m_pMailerURLED->SaveValue();
+ if(pImpl->aMailConfig.bHidden)
+ m_pSuppressHidden->SetState(TRISTATE_TRUE);
+ else
+ m_pSuppressHidden->SetState(TRISTATE_FALSE);
+ m_pSuppressHidden->SaveValue();
+
m_pMailContainer->Enable(!pImpl->aMailConfig.bROProgram);
}