1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
--- src/kernel/cdict.cc.orig 2010-04-27 18:42:09 UTC
+++ src/kernel/cdict.cc
@@ -95,7 +95,7 @@ CDict::containsProperty (const string& n
//
//
//
-shared_ptr<IProperty>
+boost::shared_ptr<IProperty>
CDict::getProperty (PropertyId id) const
{
//kernelPrintDbg (debug::DBG_DBG,"getProperty() " << id);
@@ -111,7 +111,7 @@ CDict::getProperty (PropertyId id) const
if (it == value.end())
throw ElementNotFoundException ("", "");
- shared_ptr<IProperty> ip = cmp.getIProperty ();
+ boost::shared_ptr<IProperty> ip = cmp.getIProperty ();
// Set mode only if pdf is valid
_setMode (ip,id);
@@ -188,7 +188,7 @@ CDict::delProperty (PropertyId id)
if (oldit == value.end())
throw ElementNotFoundException ("CDict", "item not found");
- shared_ptr<IProperty> oldip = cmp.getIProperty ();
+ boost::shared_ptr<IProperty> oldip = cmp.getIProperty ();
// Delete that item
value.erase (oldit);
@@ -198,11 +198,11 @@ CDict::delProperty (PropertyId id)
assert (hasValidRef (this));
// Indicate that this object has changed
- shared_ptr<ObserverContext> context (_createContext (oldip,id));
+ boost::shared_ptr<ObserverContext> context (_createContext (oldip,id));
try {
// notify observers and dispatch the change
- _objectChanged (shared_ptr<IProperty> (new CNull), context);
+ _objectChanged (boost::shared_ptr<IProperty> (new CNull), context);
}catch (PdfException&)
{
@@ -224,7 +224,7 @@ CDict::delProperty (PropertyId id)
//
// Correctly add an object (with name) can be done only to Dict and Stream object
//
-shared_ptr<IProperty>
+boost::shared_ptr<IProperty>
CDict::addProperty (const string& propertyName, const IProperty& newIp)
{
kernelPrintDbg (debug::DBG_DBG,"addProperty( " << propertyName << ",...)");
@@ -239,7 +239,7 @@ CDict::addProperty (const string& proper
throw CObjInvalidObject ();
// Clone the added property
- shared_ptr<IProperty> newIpClone = newIp.clone ();
+ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
if (newIpClone)
{
// Inherit id, gen number and pdf
@@ -260,7 +260,7 @@ CDict::addProperty (const string& proper
assert (hasValidRef (this));
// notify observers and dispatch change
- shared_ptr<ObserverContext> context (_createContext(shared_ptr<IProperty>(new CNull ()), propertyName));
+ boost::shared_ptr<ObserverContext> context (_createContext(boost::shared_ptr<IProperty>(new CNull ()), propertyName));
try {
// notify observers and dispatch the change
@@ -285,7 +285,7 @@ CDict::addProperty (const string& proper
//
//
//
-shared_ptr<IProperty>
+boost::shared_ptr<IProperty>
CDict::setProperty (PropertyId id, IProperty& newIp)
{
kernelPrintDbg (debug::DBG_DBG, "setProperty(" << id << ")");
@@ -308,9 +308,9 @@ CDict::setProperty (PropertyId id, IProp
return addProperty (id, newIp);
// Save the old one
- shared_ptr<IProperty> oldIp = cmp.getIProperty ();
+ boost::shared_ptr<IProperty> oldIp = cmp.getIProperty ();
// Clone the added property
- shared_ptr<IProperty> newIpClone = newIp.clone ();
+ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
assert (newIpClone);
// Inherit id, gen number and pdf
@@ -328,7 +328,7 @@ CDict::setProperty (PropertyId id, IProp
assert (hasValidRef (this));
// Notify observers and dispatch change
- shared_ptr<ObserverContext> context (_createContext (oldIp,id));
+ boost::shared_ptr<ObserverContext> context (_createContext (oldIp,id));
try {
// notify observers and dispatch the change
@@ -382,7 +382,7 @@ CDict::_makeXpdfObject () const
Value::const_iterator it = value.begin();
for (; it != value.end(); ++it)
{
- shared_ptr<IProperty> prop = it->second;
+ boost::shared_ptr<IProperty> prop = it->second;
Object * propObj = prop->_makeXpdfObject();
dictObj->dictAdd(copyString((it->first).c_str()), propObj);
gfree(propObj);
@@ -398,7 +398,7 @@ CDict::_makeXpdfObject () const
//
void
CDict::_objectChanged
- (shared_ptr<IProperty> newValue, shared_ptr<const ObserverContext> context)
+ (boost::shared_ptr<IProperty> newValue, boost::shared_ptr<const ObserverContext> context)
{
// Do not notify anything if we are not in a valid pdf
if (!hasValidPdf (this))
@@ -424,10 +424,10 @@ CDict::_objectChanged
// Set mode
//
void
-CDict::_setMode (shared_ptr<IProperty> ip, PropertyId id) const
+CDict::_setMode (boost::shared_ptr<IProperty> ip, PropertyId id) const
{
configuration::ModeController* modecontroller = NULL;
- shared_ptr<CPdf> p = this->getPdf().lock();
+ boost::shared_ptr<CPdf> p = this->getPdf().lock();
if ( p && (NULL != (modecontroller=p->getModeController())))
{
assert (modecontroller);
@@ -451,7 +451,7 @@ CDict::_setMode (shared_ptr<IProperty> i
}else
{ // We have found a type
string tmp;
- shared_ptr<IProperty> type = cmp.getIProperty ();
+ boost::shared_ptr<IProperty> type = cmp.getIProperty ();
if (isName (type))
IProperty::getSmartCObjectPtr<CName>(type)->getValue(tmp);
mode = modecontroller->getMode (tmp, id);
@@ -498,7 +498,7 @@ CDict::doClone () const
//
//
IProperty::ObserverContext*
-CDict::_createContext (shared_ptr<IProperty> changedIp, PropertyId id)
+CDict::_createContext (boost::shared_ptr<IProperty> changedIp, PropertyId id)
{
// Create the context
return new CDictComplexObserverContext (changedIp, id);
|
