fldedt.cxx (efeef26f) fldedt.cxx (69a74367)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 19 unchanged lines hidden (view full) ---

28#endif
29#include <vcl/msgbox.hxx>
30#include <sfx2/basedlgs.hxx>
31#include <sfx2/viewfrm.hxx>
32#include <sfx2/request.hxx>
33#include <sfx2/app.hxx>
34#include <svx/optgenrl.hxx>
35#include <docufld.hxx>
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 19 unchanged lines hidden (view full) ---

28#endif
29#include <vcl/msgbox.hxx>
30#include <sfx2/basedlgs.hxx>
31#include <sfx2/viewfrm.hxx>
32#include <sfx2/request.hxx>
33#include <sfx2/app.hxx>
34#include <svx/optgenrl.hxx>
35#include <docufld.hxx>
36#ifndef _VIEW_HXX
36#include <expfld.hxx>
37#include <view.hxx>
37#include <view.hxx>
38#endif
39#include <dbfld.hxx>
40#include <wrtsh.hxx>
38#include <dbfld.hxx>
39#include <wrtsh.hxx>
41#ifndef _FLDDB_HXX
42#include <flddb.hxx>
40#include <flddb.hxx>
43#endif
44#ifndef _FLDDINF_HXX
45#include <flddinf.hxx>
41#include <flddinf.hxx>
46#endif
47#ifndef _FLDVAR_HXX
48#include <fldvar.hxx>
42#include <fldvar.hxx>
49#endif
50#ifndef _FLDDOK_HXX
51#include <flddok.hxx>
43#include <flddok.hxx>
52#endif
53#ifndef _FLDFUNC_HXX
54#include <fldfunc.hxx>
44#include <fldfunc.hxx>
55#endif
56#ifndef _FLDREF_HXX
57#include <fldref.hxx>
45#include <fldref.hxx>
58#endif
59#include <fldedt.hxx>
60#include <crsskip.hxx>
61
62
46#include <fldedt.hxx>
47#include <crsskip.hxx>
48
49
63#ifndef _CMDID_H
64#include <cmdid.h>
50#include <cmdid.h>
65#endif
66#ifndef _HELPID_H
67#include <helpid.h>
51#include <helpid.h>
68#endif
69#ifndef _GLOBALS_HRC
70#include <globals.hrc>
52#include <globals.hrc>
71#endif
72#ifndef _FLDUI_HRC
73#include <fldui.hrc>
53#include <fldui.hrc>
74#endif
75#include "swabstdlg.hxx"
76#include "dialog.hrc"
77
78#include <com/sun/star/document/XDocumentProperties.hpp>
79#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
80
81
82namespace swui

--- 15 unchanged lines hidden (view full) ---

98 SwFldMgr aMgr(pSh);
99
100 SwField *pCurFld = aMgr.GetCurFld();
101 if(!pCurFld)
102 return;
103
104 pSh->SetCareWin(this);
105
54#include "swabstdlg.hxx"
55#include "dialog.hrc"
56
57#include <com/sun/star/document/XDocumentProperties.hpp>
58#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
59
60
61namespace swui

--- 15 unchanged lines hidden (view full) ---

77 SwFldMgr aMgr(pSh);
78
79 SwField *pCurFld = aMgr.GetCurFld();
80 if(!pCurFld)
81 return;
82
83 pSh->SetCareWin(this);
84
106 /* #108536# Only create selection if there is none
107 already. Normalize PaM instead of swapping. */
85 if ( pSh->CrsrInsideInputFld() )
86 {
87 // move cursor to start of Input Field
88 SwInputField* pInputFld = dynamic_cast<SwInputField*>(pCurFld);
89 if ( pInputFld != NULL
90 && pInputFld->GetFmtFld() != NULL )
91 {
92 pSh->GotoField( *(pInputFld->GetFmtFld()) );
93 }
94 }
95
108 if ( ! pSh->HasSelection() )
96 if ( ! pSh->HasSelection() )
97 {
109 pSh->Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
98 pSh->Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
99 }
110
111 pSh->NormalizePam();
112
113 sal_uInt16 nGroup = aMgr.GetGroup(sal_False, pCurFld->GetTypeId(), pCurFld->GetSubType());
114
115 CreatePage(nGroup);
116
117 GetOKButton()->SetClickHdl(LINK(this, SwFldEditDlg, OKHdl));

--- 301 unchanged lines hidden --- 		100
101 pSh->NormalizePam();
102
103 sal_uInt16 nGroup = aMgr.GetGroup(sal_False, pCurFld->GetTypeId(), pCurFld->GetSubType());
104
105 CreatePage(nGroup);
106
107 GetOKButton()->SetClickHdl(LINK(this, SwFldEditDlg, OKHdl));

--- 301 unchanged lines hidden ---