diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-01-07 15:35:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-01-07 15:35:26 +0000 |
| commit | 174fd9890cf41e9cd544887d7263d1b58438e8b8 (patch) | |
| tree | b2c38c2f80966788bb552aea3a1435168d381e69 /sw | |
| parent | 55731c8d4d24c703c53bee42a29284a8d513309b (diff) | |
INTEGRATION: CWS geordi2q12 (1.37.50); FILE MERGED
2004/01/07 14:08:21 hr 1.37.50.2: #111934#: merge CWS mnemonics -> SRC680
2004/01/07 12:14:56 hr 1.37.50.1: #111934#: merge CWS sw7pp2a -> SRC680
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 3f332b052522..a6b99642d390 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: rt $ $Date: 2003-12-01 17:33:28 $ + * last change: $Author: rt $ $Date: 2004-01-07 16:35:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,6 +78,9 @@ #ifndef _SV_MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif +#ifndef _SV_MNEMONIC_HXX +#include <vcl/mnemonic.hxx> +#endif #ifndef SVTOOLS_URIHELPER_HXX #include <svtools/urihelper.hxx> #endif @@ -1246,7 +1249,7 @@ USHORT SwFrmPage::FillPosLB(FrmMap *pMap, USHORT nAlign, ListBox &rLB) USHORT nResId = aMirrorPagesCB.IsChecked() ? pMap[i].nMirrorStrId : pMap[i].nStrId; nResId = lcl_ChangeResIdToVerticalOrRTL(nResId, bIsVerticalFrame, bIsInRightToLeft); String sEntry(SW_RES(nResId)); - sEntry.EraseAllChars( '~' ); + sEntry = MnemonicGenerator::EraseAllMnemonicChars( sEntry ); if (rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND) // bei zeichengebundenen Rahmen keine doppelten Eintraege einfuegen rLB.InsertEntry(sEntry); @@ -1477,7 +1480,7 @@ USHORT SwFrmPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB) USHORT nResId = pMap[i].nStrId; String sEntry(SW_RES(nResId)); - sEntry.EraseAllChars( '~' ); + sEntry = MnemonicGenerator::EraseAllMnemonicChars( sEntry ); if (sEntry == sSelEntry) { @@ -1568,12 +1571,14 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn ) if (pBtn == &aRelWidthCB) { aWidthED.ShowPercent(pBtn->IsChecked()); - aWidthED.MetricField::SetMax(MAX_PERCENT_WIDTH); + if(pBtn->IsChecked()) + aWidthED.MetricField::SetMax(MAX_PERCENT_WIDTH); } else // pBtn == &aRelHeightCB { aHeightED.ShowPercent(pBtn->IsChecked()); - aHeightED.MetricField::SetMax(MAX_PERCENT_HEIGHT); + if(pBtn->IsChecked()) + aHeightED.MetricField::SetMax(MAX_PERCENT_HEIGHT); } if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde |